Rename fd.[ch] to util.[ch].

[osl.git] / Makefile

diff --git a/Makefile b/Makefile
index bcb5cea550c1f332e6f57adfa9066292992206dd..b42b1a9413a7194582139307f57857de11871ab2 100644 (file)
--- 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
@@ -93,8 +93,7 @@ endif
 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
 
@@ -107,10 +106,11 @@ fsck.cmdline.o: fsck.cmdline.c fsck.cmdline.h
 %.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" \
@@ -133,8 +133,8 @@ osl_errors.h: errlist
 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