Fix various gcc -Wall nits. Fixed a bug in mke2fs where a bogus

[tools/e2fsprogs.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 0e6c35c..e03fcdd 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -7,35 +7,41 @@ INSTALL = @INSTALL@
 
 @MCONFIG@
 
-LIB_SUBDIRS=lib/et lib/ss lib/ext2fs lib/e2p lib/uuid
-PROG_SUBDIRS=e2fsck debugfs misc resize tests/progs 
+@RESIZER_CMT@RESIZE_DIR= resize
+@DEBUGFS_CMT@DEBUGFS_DIR= debugfs
+
+LIB_SUBDIRS=lib/et lib/ss lib/e2p lib/ext2fs lib/uuid # lib/finddev
+PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs 
 SUBDIRS=util $(LIB_SUBDIRS) $(PROG_SUBDIRS) tests
 
-SUBS= include/asm/types.h
+SUBS= lib/ext2fs/ext2_types.h
 
 TAR=tar
 
-all:: $(SUBS) libs progs docs
+all:: $(SUBS) 
+       $(MAKE) libs
+       $(MAKE) progs
+       $(MAKE) docs
 
 progs: $(SUBS) all-progs-recursive
 libs: $(SUBS) all-libs-recursive
 
 docs:
-       cd doc && make libext2fs.info
+       cd doc && $(MAKE) libext2fs.info
 
 install-doc-libs:
-       cd doc && make install-doc-libs
+       cd doc && $(MAKE) install-doc-libs
 
 uninstall-doc-libs:
-       cd doc && make uninstall-doc-libs
+       cd doc && $(MAKE) uninstall-doc-libs
 
 clean-doc:
-       cd doc && make clean
+       cd doc && $(MAKE) clean
 
 distclean-doc:
-       cd doc && make distclean
+       cd doc && $(MAKE) distclean
 
-install: all-libs-recursive install-progs-recursive \
+install: $(SUBS) all-libs-recursive install-progs-recursive \
        install-shlibs-libs-recursive install-doc-libs
 #      export MANPATH=$(DESTDIR)$(mandir); $(srcdir)/install-utils/compile_manpages
 
@@ -45,7 +51,7 @@ install-libs: install-libs-recursive
 
 uninstall-libs: uninstall-libs-recursive
 
-TAGS clean-recursive distclean-recursive depend-recursive \
+TAGS clean-recursive distclean-recursive depend-recursive check-recursive \
            mostlyclean-recursive realclean-recursive install-recursive:
        for subdir in $(SUBDIRS); do \
          if test -d $$subdir ; then \
@@ -84,29 +90,28 @@ realclean: realclean-recursive realclean-local
 
 depend:: depend-recursive
 
-include/asm/types.h: $(DEP_SUBSTITUTE) $(srcdir)/include/asm/types.h.in
-       $(SUBSTITUTE) $(srcdir)/include/asm/types.h.in \
-       > include/asm/types.h
+lib/ext2fs/ext2_types.h: $(DEP_SUBSTITUTE) $(srcdir)/lib/ext2fs/ext2_types.h.in
+       $(SUBSTITUTE) $(srcdir)/lib/ext2fs/ext2_types.h.in \
+       > lib/ext2fs/ext2_types.h
 
 mostlyclean-local:
-       $(RM) -f \#* *~ core MAKELOG 
+       $(RM) -f \#* *~ *.orig core MAKELOG 
 
 clean-local: mostlyclean-local
 
 distclean-local: clean-local
-       $(RM) -f include/asm/types.h $(SUBST_CONF) \
+       $(RM) -f $(SUBS) $(SUBST_CONF) \
                config.status config.log config.cache MCONFIG Makefile \
                $(srcdir)/TAGS $(srcdir)/Makefile.in.old
 
 realclean-local: distclean-local
        $(RM) -f configure
 
-check:
-       cd tests && make check
+check::        $(SUBS) check-recursive
 
 distribution_tar_file:
        $(RM) -rf /tmp/dest
-       make DESTDIR=/tmp/dest install
+       $(MAKE) DESTDIR=/tmp/dest install
        cp -r $(srcdir)/README $(srcdir)/install-utils /tmp/dest
        $(RM) -rf /tmp/dest/install-utils/CVS /tmp/dest/install-utils/ChangeLog
        cp $(srcdir)/INSTALL.@BINARY_TYPE@ /tmp/dest/INSTALL
@@ -120,11 +125,13 @@ $(srcdir)/.exclude-file:
        a=$(SRCROOT); \
        (cd $(srcdir)/.. && find e2fsprogs \( -name \*~ -o -name \*.orig \
                -o -name CVS -o -name \*.rej -o -name Makefile.pq \
-               -o -name TAGS -o -name \*.old -o -name \*.gmo \
-               -o -name TODO -o -name changed-files -o -name .#\* \) \
+               -o -name TAGS -o -name \*.old -o -name \*.gmo -o -name SCCS \
+               -o -name changed-files -o -name .#\* \) \
                -print) | sed -e "s/e2fsprogs/$$a/" > $(srcdir)/.exclude-file
+       echo "$(SRCROOT)/BitKeeper" >> $(srcdir)/.exclude-file
        echo "$(SRCROOT)/build" >> $(srcdir)/.exclude-file
        echo "$(SRCROOT)/rpm.log" >> $(srcdir)/.exclude-file
+       echo "$(SRCROOT)/TODO" >> $(srcdir)/.exclude-file
        echo "$(SRCROOT)/powerquest" >> $(srcdir)/.exclude-file
        echo "$(SRCROOT)/.exclude-file" >> $(srcdir)/.exclude-file
        echo "$(SRCROOT)/po/stamp-cat-id" >> $(srcdir)/.exclude-file