X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=Makefile.in;h=abbd5a84d2356df668e6a651b0920580bfdec92d;hb=68a7f959c0af3d6e32cf9339433667f04b8a1c56;hp=dd9ef7d0b56de741d836ca9907f407e26b9022ee;hpb=44339bdff87584b72a2ade7d3a1426e3335f2167;p=tools%2Fe2fsprogs.git

diff --git a/Makefile.in b/Makefile.in
index dd9ef7d..abbd5a8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -7,34 +7,59 @@ INSTALL = @INSTALL@
 
 @MCONFIG@
 
-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
+@RESIZER_CMT@RESIZE_DIR= resize
+@DEBUGFS_CMT@DEBUGFS_DIR= debugfs
 
-SUBS= include/linux/types.h
+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
+SUBDIRS=util $(LIB_SUBDIRS) $(PROG_SUBDIRS) tests
+
+SUBS= lib/ext2fs/ext2_types.h lib/blkid/blkid_types.h lib/uuid/uuid_types.h
 
 TAR=tar
 
-all:: $(SUBS) libs progs docs
+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
+progs: subs all-progs-recursive
+libs: subs all-libs-recursive
 
 docs:
-	(cd doc; make libext2fs.info)
+	-@test -d doc && cd doc && $(MAKE) libext2fs.info
 
 install-doc-libs:
-	(cd doc; make 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
 
-install: all-libs-recursive install-progs-recursive \
-	install-shlibs-libs-recursive install-doc-libs
-	(export MANPATH=$(DESTDIR)$(mandir); $(srcdir)/install-utils/compile_manpages)
+distclean-doc:
+	-test -d doc && cd doc && $(MAKE) distclean
+
+install: subs all-libs-recursive install-progs-recursive \
+  install-shlibs-libs-recursive install-doc-libs
+	if test ! -d e2fsck && test ! -d debugfs && test ! -d misc && test ! -d ext2ed ; then $(MAKE) install-libs ; fi
+
+install-strip: subs all-libs-recursive install-strip-progs-recursive \
+  install-shlibs-strip-libs-recursive install-doc-libs
+
+uninstall: uninstall-progs-recursive uninstall-shlibs-libs-recursive uninstall-doc-libs
 
 install-libs: install-libs-recursive
 
-TAGS clean-recursive distclean-recursive \
-	    mostlyclean-recursive realclean-recursive install-recursive:
-	for subdir in $(SUBDIRS); do \
+uninstall-libs: uninstall-libs-recursive
+
+TAGS clean-recursive distclean-recursive depend-recursive check-recursive \
+  mostlyclean-recursive realclean-recursive:
+	@for subdir in $(SUBDIRS); do \
 	  if test -d $$subdir ; then \
 	    target=`echo $@|$(SED) 's/-recursive//'`; \
 	    echo making $$target in $$subdir; \
@@ -42,8 +67,9 @@ TAGS clean-recursive distclean-recursive \
 	  fi ; \
 	done
 
-all-progs-recursive install-progs-recursive:
-	for subdir in $(PROG_SUBDIRS); do \
+all-progs-recursive install-progs-recursive install-strip-progs-recursive \
+  uninstall-progs-recursive:
+	@for subdir in $(PROG_SUBDIRS); do \
 	  if test -d $$subdir ; then \
 	    target=`echo $@|$(SED) 's/-progs-recursive//'`; \
 	    echo making $$target in $$subdir; \
@@ -51,8 +77,10 @@ all-progs-recursive install-progs-recursive:
 	  fi ; \
 	done
 
-all-libs-recursive install-libs-recursive install-shlibs-libs-recursive:
-	for subdir in $(LIB_SUBDIRS); do \
+all-libs-recursive install-libs-recursive install-strip-libs-recursive \
+  uninstall-libs-recursive install-shlibs-libs-recursive \
+  install-shlibs-strip-libs-recursive uninstall-shlibs-libs-recursive:
+	@for subdir in $(LIB_SUBDIRS); do \
 	  if test -d $$subdir ; then \
 	    target=`echo $@|$(SED) 's/-libs-recursive//'`; \
 	    echo making $$target in $$subdir; \
@@ -62,56 +90,43 @@ all-libs-recursive install-libs-recursive install-shlibs-libs-recursive:
 
 mostlyclean: mostlyclean-recursive mostlyclean-local
 
-clean: clean-recursive clean-local
-	$(RM) -f $(SUBS)
+clean: clean-recursive clean-local clean-doc
+	$(RM) -f $(SUBS) 
 
-distclean: distclean-recursive distclean-local
+distclean: distclean-doc distclean-recursive distclean-local 
+	$(RM) -rf autom4te.cache e2fsprogs.spec ext2ed/Makefile po/stamp-po
 
 realclean: realclean-recursive realclean-local
 
-include/linux/types.h: $(DEP_SUBSTITUTE) $(srcdir)/include/linux/types.h.in
-	$(SUBSTITUTE) $(srcdir)/include/linux/types.h.in \
-	> include/linux/types.h
+depend:: depend-recursive
+
+lib/ext2fs/ext2_types.h: $(DEP_SUBSTITUTE) $(srcdir)/lib/ext2fs/ext2_types.h.in
+	@echo "	SUBST $@"
+	@$(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
+	@echo "	SUBST $@"
+	@$(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
+	@echo "	SUBST $@"
+	@$(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 $(SUBSTITUTE)
-	$(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)
-
-distribution_tar_file:
-	rm -rf /tmp/dest
-	make DESTDIR=/tmp/dest install
-	cd ..
-	cp -r $(srcdir)/README $(srcdir)/install-utils /tmp/dest
-	cp $(srcdir)/INSTALL.@BINARY_TYPE@ /tmp/dest/INSTALL
-	(cd /tmp/dest; $(TAR) cf - . ) | gzip -9 \
-		> e2fsprogs-@E2FSPROGS_VERSION@-@BINARY_TYPE@.tar.gz
-
-SRCROOT = `echo e2fsprogs-@E2FSPROGS_VERSION@ | sed -e 's/-WIP//' \
-			-e 's/pre-//' -e 's/-PLUS//'`
-
-$(srcdir)/.exclude-file:
-	a=$(SRCROOT); \
-	(cd $(srcdir)/.. ; find e2fsprogs \( -name \*~ -o -name \*.orig \
-		-o -name CVS -o -name \*.rej \) -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)/.exclude-file" >> $(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 ; \
-		$(TAR) -c -h -v -f - \
-			-X $$a/.exclude-file $$a | \
-		gzip -9 > e2fsprogs-@E2FSPROGS_VERSION@.tar.gz)
-	rm -f $(srcdir)/.exclude-file
+check::	subs check-recursive
+