X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=Makefile.in;h=88d6c3ad545b1e48ac9b040f0571d3a83940cde7;hb=e0f72cfdad605231739174fc82f17693d19baf3b;hp=7ec96f134439d54d2e08557fa71f83ef7c7e1a6f;hpb=921f4ad53646091767de1e64c9b3332c85f37e5b;p=tools%2Fe2fsprogs.git

diff --git a/Makefile.in b/Makefile.in
index 7ec96f1..88d6c3a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -24,31 +24,33 @@ all:: subs
 	$(MAKE) docs
 
 subs:
-	for i in $(SUBS) ; do if test -d `dirname $$i` ; then $(MAKE) $$i ; fi ; done
+	@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
+	-@test -d doc && cd doc && $(MAKE) libext2fs.info
 
 install-doc-libs:
-	-test -d doc && 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
+	-@test -d doc && cd doc && $(MAKE) uninstall-doc-libs
 
 clean-doc:
-	-test -d doc && cd doc && $(MAKE) clean
+	-@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
+  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,8 +58,8 @@ 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:
-	for subdir in $(SUBDIRS); do \
+  mostlyclean-recursive realclean-recursive:
+	@for subdir in $(SUBDIRS); do \
 	  if test -d $$subdir ; then \
 	    target=`echo $@|$(SED) 's/-recursive//'`; \
 	    echo making $$target in $$subdir; \
@@ -65,8 +67,9 @@ TAGS clean-recursive distclean-recursive depend-recursive check-recursive \
 	  fi ; \
 	done
 
-all-progs-recursive install-progs-recursive uninstall-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; \
@@ -74,8 +77,10 @@ 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:
-	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; \
@@ -86,25 +91,26 @@ 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 
+	$(RM) -rf autom4te.cache e2fsprogs.spec ext2ed/Makefile po/stamp-po
 
 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/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
-	$(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
-	$(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