X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=Makefile.in;h=5708efdead5cd774a00aefb34ad017eb64354fbc;hb=b1503c446a9cd3041c94945df7a9772e812dbd21;hp=72e0b1b226b494340492a55ea821d67a451b43d3;hpb=47204ff9830b17fc6317f48e88d2039f57a5d10a;p=tools%2Fe2fsprogs.git

diff --git a/Makefile.in b/Makefile.in
index 72e0b1b..5708efd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -7,10 +7,14 @@ INSTALL = @INSTALL@
 
 @MCONFIG@
 
+% : %.sh
+
 @RESIZER_CMT@RESIZE_DIR= resize
 @DEBUGFS_CMT@DEBUGFS_DIR= debugfs
+@UUID_CMT@UUID_LIB_SUBDIR= lib/uuid
+@BLKID_CMT@BLKID_LIB_SUBDIR= lib/blkid
 
-LIB_SUBDIRS=lib/et lib/ss lib/e2p lib/ext2fs lib/uuid lib/blkid intl
+LIB_SUBDIRS=lib/et lib/ss lib/e2p $(UUID_LIB_SUBDIR) lib/ext2fs $(BLKID_LIB_SUBDIR) intl
 PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs po
 SUBDIRS=util $(LIB_SUBDIRS) $(PROG_SUBDIRS) tests
 
@@ -23,11 +27,21 @@ all:: subs
 	$(MAKE) progs
 	$(MAKE) docs
 
-subs:
-	@for i in $(SUBS) ; do if test -d `dirname $$i` ; then $(MAKE) $$i ; fi ; done
+subs: $(DEP_SUBSTITUTE)
+	@for i in $(SUBS) ; do if test -d `dirname $$i` ; \
+		then $(MAKE) $$i || exit $$? ; fi ; done
+	@(if test -d lib/et ; then cd lib/et && $(MAKE) compile_et; fi)
+	@(if test -d lib/ext2fs ; then cd lib/ext2fs && $(MAKE) ext2_err.h; fi)
+
+progs: all-progs-recursive
+libs: all-libs-recursive
+all-progs-recursive all-libs-recursive: subs
 
-progs: subs all-progs-recursive
-libs: subs all-libs-recursive
+e2fsprogs.spec: $(DEP_SUBSTITUTE) e2fsprogs.spec.in
+	cd $(top_builddir); CONFIG_FILES=./e2fsprogs.spec ./config.status
+
+rpm: e2fsprogs.spec
+	sh contrib/build-rpm
 
 docs:
 	-@test -d doc && cd doc && $(MAKE) libext2fs.info
@@ -45,10 +59,12 @@ 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
+  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
@@ -56,7 +72,7 @@ install-libs: install-libs-recursive
 uninstall-libs: uninstall-libs-recursive
 
 TAGS clean-recursive distclean-recursive depend-recursive check-recursive \
-	    mostlyclean-recursive realclean-recursive install-recursive:
+  mostlyclean-recursive realclean-recursive:
 	@for subdir in $(SUBDIRS); do \
 	  if test -d $$subdir ; then \
 	    target=`echo $@|$(SED) 's/-recursive//'`; \
@@ -65,7 +81,8 @@ TAGS clean-recursive distclean-recursive depend-recursive check-recursive \
 	  fi ; \
 	done
 
-all-progs-recursive install-progs-recursive uninstall-progs-recursive:
+all-progs-recursive install-progs-recursive install-strip-progs-recursive \
+  uninstall-progs-recursive: all-libs-recursive
 	@for subdir in $(PROG_SUBDIRS); do \
 	  if test -d $$subdir ; then \
 	    target=`echo $@|$(SED) 's/-progs-recursive//'`; \
@@ -74,7 +91,9 @@ all-progs-recursive install-progs-recursive uninstall-progs-recursive:
 	  fi ; \
 	done
 
-all-libs-recursive install-libs-recursive uninstall-libs-recursive install-shlibs-libs-recursive uninstall-shlibs-libs-recursive:
+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//'`; \
@@ -86,28 +105,27 @@ all-libs-recursive install-libs-recursive uninstall-libs-recursive install-shlib
 mostlyclean: mostlyclean-recursive mostlyclean-local
 
 clean: clean-recursive clean-local clean-doc
-	$(RM) -f $(SUBS)
+	$(RM) -f $(SUBS) 
 
-distclean: distclean-doc distclean-recursive distclean-local 
+distclean: distclean-doc distclean-recursive
+	$(RM) -rf autom4te.cache e2fsprogs.spec ext2ed/Makefile po/stamp-po
+	$(MAKE) distclean-local 
 
 realclean: realclean-recursive realclean-local
 
 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/ext2fs/ext2_types.h: $(DEP_SUBSTITUTE) asm_types.h \
+		$(srcdir)/lib/ext2fs/ext2_types.h.in
+	cd $(top_builddir); CONFIG_FILES=./lib/ext2fs/ext2_types.h ./config.status
 
-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/blkid/blkid_types.h: $(DEP_SUBSTITUTE) asm_types.h \
+		$(srcdir)/lib/blkid/blkid_types.h.in
+	cd $(top_builddir); CONFIG_FILES=./lib/blkid/blkid_types.h ./config.status
 
-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
+lib/uuid/uuid_types.h: $(DEP_SUBSTITUTE) asm_types.h \
+		$(srcdir)/lib/uuid/uuid_types.h.in
+	cd $(top_builddir); CONFIG_FILES=./lib/uuid/uuid_types.h ./config.status
 
 mostlyclean-local:
 	$(RM) -f \#* *~ *.orig core MAKELOG