journal.c (e2fsck_move_ext3_journal): When moving the journal or

[tools/e2fsprogs.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 7aaa85e..d86f923 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,68 +2,124 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 top_builddir = .
+my_dir = .
 INSTALL = @INSTALL@
 
 @MCONFIG@
 
-LIB_SUBDIRS=lib/et lib/ss lib/ext2fs lib/e2p
-PROG_SUBDIRS=e2fsck debugfs misc
-SUBDIRS=$(LIB_SUBDIRS) $(PROG_SUBDIRS) tests
+@RESIZER_CMT@RESIZE_DIR= resize
+@DEBUGFS_CMT@DEBUGFS_DIR= debugfs
+@EVMS_CMT@EVMS_DIR= lib/evms
 
-all:: libs progs check
+LIB_SUBDIRS=lib/et lib/ss lib/e2p lib/ext2fs lib/uuid lib/blkid intl
+PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs po \
+       $(EVMS_DIR) 
+SUBDIRS=util $(LIB_SUBDIRS) $(PROG_SUBDIRS) tests
 
-progs: all-progs-recursive
-libs: all-libs-recursive
+SUBS= lib/ext2fs/ext2_types.h lib/blkid/blkid_types.h lib/uuid/uuid_types.h
 
-install: all-libs-recursive install-progs-recursive \
-       install-shlibs-libs-recursive
-       (export MANPATH=$(DESTDIR)$(mandir); $(srcdir)/install-utils/compile_manpages)
+TAR=tar
+
+all:: subs
+       $(MAKE) libs
+       $(MAKE) progs
+       $(MAKE) docs
+
+subs:
+       for i in $(SUBS) ; do if test -d `dirname $$i` ; then $(MAKE) $$i ; fi ; done
+
+progs: subs all-progs-recursive
+libs: subs all-libs-recursive
+
+docs:
+       -test -d doc && cd doc && $(MAKE) libext2fs.info
+
+install-doc-libs:
+       -test -d doc && cd doc && $(MAKE) install-doc-libs
+
+uninstall-doc-libs:
+       -test -d doc && cd doc && $(MAKE) uninstall-doc-libs
+
+clean-doc:
+       -test -d doc && cd doc && $(MAKE) clean
+
+distclean-doc:
+       -test -d doc && cd doc && $(MAKE) distclean
+
+install: subs all-libs-recursive install-progs-recursive \
+       install-shlibs-libs-recursive install-doc-libs
+#      export MANPATH=$(DESTDIR)$(mandir); $(srcdir)/install-utils/compile_manpages
+       if test ! -d e2fsck -a ! -d debugfs -a ! -d misc -a ! -d ext2ed ; then $(MAKE) install-libs ; fi
+
+uninstall: uninstall-progs-recursive uninstall-shlibs-libs-recursive uninstall-doc-libs
 
 install-libs: install-libs-recursive
 
-TAGS clean-recursive distclean-recursive \
+uninstall-libs: uninstall-libs-recursive
+
+TAGS clean-recursive distclean-recursive depend-recursive check-recursive \
            mostlyclean-recursive realclean-recursive install-recursive:
        for subdir in $(SUBDIRS); do \
-         target=`echo $@|$(SED) 's/-recursive//'`; \
-         echo making $$target in $$subdir; \
-         (cd $$subdir && $(MAKE) $$target) || exit 1; \
+         if test -d $$subdir ; then \
+           target=`echo $@|$(SED) 's/-recursive//'`; \
+           echo making $$target in $$subdir; \
+           (cd $$subdir && $(MAKE) $$target) || exit 1; \
+         fi ; \
        done
 
-all-progs-recursive install-progs-recursive:
+all-progs-recursive install-progs-recursive uninstall-progs-recursive:
        for subdir in $(PROG_SUBDIRS); do \
-         target=`echo $@|$(SED) 's/-progs-recursive//'`; \
-         echo making $$target in $$subdir; \
-         (cd $$subdir && $(MAKE) $$target) || exit 1; \
+         if test -d $$subdir ; then \
+           target=`echo $@|$(SED) 's/-progs-recursive//'`; \
+           echo making $$target in $$subdir; \
+           (cd $$subdir && $(MAKE) $$target) || exit 1; \
+         fi ; \
        done
 
-all-libs-recursive install-libs-recursive install-shlibs-libs-recursive:
+all-libs-recursive install-libs-recursive uninstall-libs-recursive install-shlibs-libs-recursive uninstall-shlibs-libs-recursive:
        for subdir in $(LIB_SUBDIRS); do \
-         target=`echo $@|$(SED) 's/-libs-recursive//'`; \
-         echo making $$target in $$subdir; \
-         (cd $$subdir && $(MAKE) $$target) || exit 1; \
+         if test -d $$subdir ; then \
+           target=`echo $@|$(SED) 's/-libs-recursive//'`; \
+           echo making $$target in $$subdir; \
+           (cd $$subdir && $(MAKE) $$target) || exit 1; \
+         fi ; \
        done
 
 mostlyclean: mostlyclean-recursive mostlyclean-local
-clean: clean-recursive clean-local
-distclean: distclean-recursive distclean-local
+
+clean: clean-recursive clean-local clean-doc
+       $(RM) -f $(SUBS)
+
+distclean: distclean-doc distclean-recursive distclean-local 
+
 realclean: realclean-recursive realclean-local
 
+depend:: depend-recursive
+
+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
+
+lib/blkid/blkid_types.h: $(DEP_SUBSTITUTE) $(srcdir)/lib/blkid/blkid_types.h.in
+       $(SUBSTITUTE) $(srcdir)/lib/blkid/blkid_types.h.in \
+       > lib/blkid/blkid_types.h
+
+lib/uuid/uuid_types.h: $(DEP_SUBSTITUTE) $(srcdir)/lib/uuid/uuid_types.h.in
+       $(SUBSTITUTE) $(srcdir)/lib/uuid/uuid_types.h.in \
+       > lib/uuid/uuid_types.h
+
 mostlyclean-local:
-       $(RM) -f \#* *~ core MAKELOG 
+       $(RM) -f \#* *~ *.orig core MAKELOG 
+
 clean-local: mostlyclean-local
+
 distclean-local: clean-local
-       $(RM) -f include/linux/types.h
-       $(RM) -f config.status config.log config.cache MCONFIG Makefile
+       $(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)
-
-Makefile: config.status $(srcdir)/Makefile.in
-       CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
+check::        subs check-recursive
 
-config.status: $(srcdir)/configure
-       ./config.status --recheck
-$(srcdir)/configure: $(srcdir)/configure.in
-       cd $(srcdir) && autoconf