X-Git-Url: http://git.tuebingen.mpg.de/?p=osl.git;a=blobdiff_plain;f=Makefile;h=b42b1a9413a7194582139307f57857de11871ab2;hp=3259a3ab37cb37e929c4cbcc9d869f4f3ee23214;hb=c1a4bb030717f2d2d209ccd8ab898ab66fa16869;hpb=dd58755b9a202ab317f96e5dd5d9220c4354774a

diff --git a/Makefile b/Makefile
index 3259a3a..b42b1a9 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,8 @@ prefix := /usr/local
 libdir := $(prefix)/lib
 includedir := $(prefix)/include
 
-objects := osl.o fd.o rbtree.o sha1.o
-fsck_objects := fsck.fsck.o osl.fsck.o fd.fsck.o rbtree.fsck.o sha1.fsck.o fsck.cmdline.o
+objects := osl.o util.o rbtree.o sha1.o
+fsck_objects := fsck.fsck.o osl.fsck.o util.fsck.o rbtree.fsck.o sha1.fsck.o fsck.cmdline.o
 headers := osl.h
 
 INSTALL := install
@@ -90,27 +90,27 @@ ifeq ($(uname_s),SunOS)
 	CPPFLAGS += -I/opt/csw/include
 endif
 
-all: $(realname)
+all: $(realname) oslfsck
 Makefile.deps: $(wildcard *.c *.h)
 	$(CC) -MM -MG *.c > $@
-osl.c: errtab.h
-
+osl.c fsck.c: errtab.h
 
 -include Makefile.deps
 
 fsck.cmdline.o: fsck.cmdline.c fsck.cmdline.h
 	$(CC) -c -DVERSION='"$(VERSION)"' $<
 
-%.fsck.o: %.c Makefile
+%.fsck.o: %.c Makefile fsck.cmdline.c fsck.cmdline.h
 	$(CC) -c -DVERSION='"$(VERSION)"' $(CPPFLAGS) $(CFLAGS) $< -o $@
 
 %.o: %.c Makefile
 	$(CC) -c $(CPPFLAGS) $(CFLAGS) $(LIBCFLAGS) $<
 
-fsck.cmdline.h fsck.cmdline.c: fsck.ggo
+fsck.cmdline.h fsck.cmdline.c: fsck.ggo Makefile
 	gengetopt $$O \
 		--conf-parser \
 		--unamed-opts=table \
+		--no-handle-version \
 		--file-name=fsck.cmdline \
 		--func-name=fsck_cmdline_parser \
 		--set-package="oslfsck" \
@@ -126,14 +126,15 @@ $(realname): $(objects)
 osl_errors.h: errlist
 	sed -e 's/\([A-Z_]*\)	.*/	E_OSL_\1/' \
 		-e '1s/^/enum osl_errors {/1' \
+		-e '1s/$$/=1/1' \
 		-e '$$!s/$$/,/g' \
 		-e '$$s/$$/};/1' $< > $@
 
 errtab.h: errlist
 	sed -e 's/^\([A-Z_]*\)\s*\(.*\)/_S(E_OSL_\1, \2)/g' $< > $@
 
-osl.h: osl.h.in osl_errors.h
-	cat $^ > $@
+osl.h: osl.h.in osl_errors.h Makefile
+	cat osl.h.in osl_errors.h > $@
 clean:
 	rm -f *.o $(realname) osl.h osl_errors.h errtab.h fsck.cmdline.h fsck.cmdline.c