Many files:

[tools/e2fsprogs.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index cca9c6f..0e6c35c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,7 +9,7 @@ INSTALL = @INSTALL@
 
 LIB_SUBDIRS=lib/et lib/ss lib/ext2fs lib/e2p lib/uuid
 PROG_SUBDIRS=e2fsck debugfs misc resize tests/progs 
-SUBDIRS=$(LIB_SUBDIRS) $(PROG_SUBDIRS) tests
+SUBDIRS=util $(LIB_SUBDIRS) $(PROG_SUBDIRS) tests
 
 SUBS= include/asm/types.h
 
@@ -21,17 +21,23 @@ 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
+
+distclean-doc:
+       cd doc && make distclean
 
 install: all-libs-recursive install-progs-recursive \
        install-shlibs-libs-recursive install-doc-libs
-#      (export MANPATH=$(DESTDIR)$(mandir); $(srcdir)/install-utils/compile_manpages)
+#      export MANPATH=$(DESTDIR)$(mandir); $(srcdir)/install-utils/compile_manpages
 
 uninstall: uninstall-progs-recursive uninstall-shlibs-libs-recursive uninstall-doc-libs
 
@@ -39,7 +45,7 @@ install-libs: install-libs-recursive
 
 uninstall-libs: uninstall-libs-recursive
 
-TAGS clean-recursive distclean-recursive \
+TAGS clean-recursive distclean-recursive depend-recursive \
            mostlyclean-recursive realclean-recursive install-recursive:
        for subdir in $(SUBDIRS); do \
          if test -d $$subdir ; then \
@@ -69,37 +75,42 @@ all-libs-recursive install-libs-recursive uninstall-libs-recursive install-shlib
 
 mostlyclean: mostlyclean-recursive mostlyclean-local
 
-clean: clean-recursive clean-local
+clean: clean-recursive clean-local clean-doc
        $(RM) -f $(SUBS)
 
-distclean: distclean-recursive distclean-local
+distclean: distclean-doc distclean-recursive distclean-local 
 
 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
 
 mostlyclean-local:
        $(RM) -f \#* *~ core MAKELOG 
+
 clean-local: mostlyclean-local
+
 distclean-local: clean-local
-       $(RM) -f include/asm/types.h $(SUBSTITUTE)
-       $(RM) -f config.status config.log config.cache MCONFIG Makefile
+       $(RM) -f include/asm/types.h $(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)
+       cd tests && make check
 
 distribution_tar_file:
-       $(RM) -r /tmp/dest
+       $(RM) -rf /tmp/dest
        make DESTDIR=/tmp/dest install
-       cd ..
        cp -r $(srcdir)/README $(srcdir)/install-utils /tmp/dest
-       $(RM) -r /tmp/dest/install-utils/CVS /tmp/dest/install-utils/ChangeLog
+       $(RM) -rf /tmp/dest/install-utils/CVS /tmp/dest/install-utils/ChangeLog
        cp $(srcdir)/INSTALL.@BINARY_TYPE@ /tmp/dest/INSTALL
-       (cd /tmp/dest; $(TAR) cf - . ) | gzip -9 \
+       (cd /tmp/dest && $(TAR) cf - . ) | gzip -9 \
                > e2fsprogs-@E2FSPROGS_VERSION@-@BINARY_TYPE@.tar.gz
 
 SRCROOT = `echo e2fsprogs-@E2FSPROGS_VERSION@ | sed -e 's/-WIP//' \
@@ -107,20 +118,23 @@ SRCROOT = `echo e2fsprogs-@E2FSPROGS_VERSION@ | sed -e 's/-WIP//' \
 
 $(srcdir)/.exclude-file:
        a=$(SRCROOT); \
-       (cd $(srcdir)/.. ; find e2fsprogs \( -name \*~ -o -name \*.orig \
-               -o -name CVS -o -name \*.rej -o -name Makefile.pq \) -print) \
-               | sed -e "s/e2fsprogs/$$a/" > $(srcdir)/.exclude-file
+       (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 .#\* \) \
+               -print) | sed -e "s/e2fsprogs/$$a/" > $(srcdir)/.exclude-file
        echo "$(SRCROOT)/build" >> $(srcdir)/.exclude-file
        echo "$(SRCROOT)/rpm.log" >> $(srcdir)/.exclude-file
-       echo "$(SRCROOT)/resize" >> $(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
+       echo "$(SRCROOT)/po/cat-id-tbl.c" >> $(srcdir)/.exclude-file
        echo $(SRCROOT)/e2fsprogs-@E2FSPROGS_VERSION@.tar.gz \
                >> $(srcdir)/.exclude-file
 
 source_tar_file: $(srcdir)/.exclude-file
-       (cd $(srcdir)/..; a=$(SRCROOT); rm -f $$a ; ln -sf e2fsprogs $$a ; \
+       cd $(srcdir)/.. && a=$(SRCROOT); rm -f $$a ; ln -sf e2fsprogs $$a ; \
                $(TAR) -c -h -v -f - \
                        -X $$a/.exclude-file $$a | \
-               gzip -9 > e2fsprogs-@E2FSPROGS_VERSION@.tar.gz)
+               gzip -9 > e2fsprogs-@E2FSPROGS_VERSION@.tar.gz
        rm -f $(srcdir)/.exclude-file