X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=Makefile.in;h=0aa2d72c82c53e7112114c697af87e665258be4d;hb=9cd756fb8c83d389662dc0c3a9ea8fece949b196;hp=745e8590e9ec6044107410d9b545d7d79c76c24b;hpb=0afb9be6aa326f69ecb3756f06aaaf1cb8150713;p=tools%2Fe2fsprogs.git

diff --git a/Makefile.in b/Makefile.in
index 745e859..0aa2d72 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,6 +4,7 @@ VPATH = @srcdir@
 top_builddir = .
 my_dir = .
 INSTALL = @INSTALL@
+MKDIR_P = @MKDIR_P@
 
 @MCONFIG@
 
@@ -13,14 +14,17 @@ INSTALL = @INSTALL@
 @DEBUGFS_CMT@DEBUGFS_DIR= debugfs
 @UUID_CMT@UUID_LIB_SUBDIR= lib/uuid
 @BLKID_CMT@BLKID_LIB_SUBDIR= lib/blkid
+@E2SCRUB_CMT@E2SCRUB_DIR= scrub
 @ALL_CMT@SUPPORT_LIB_SUBDIR= lib/support
 @ALL_CMT@E2P_LIB_SUBDIR= lib/e2p
 @ALL_CMT@EXT2FS_LIB_SUBDIR= lib/ext2fs
 
 LIB_SUBDIRS=lib/et lib/ss $(E2P_LIB_SUBDIR) $(UUID_LIB_SUBDIR) \
-	$(BLKID_LIB_SUBDIR) $(SUPPORT_LIB_SUBDIR) $(EXT2FS_LIB_SUBDIR) intl
+	$(BLKID_LIB_SUBDIR) $(SUPPORT_LIB_SUBDIR) $(EXT2FS_LIB_SUBDIR)
+
+PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs \
+	tests/fuzz po $(E2SCRUB_DIR)
 
-PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs po
 SUBDIRS=util $(LIB_SUBDIRS) $(PROG_SUBDIRS) tests
 
 SUBS= util/subst.conf lib/config.h $(top_builddir)/lib/dirpaths.h \
@@ -33,6 +37,10 @@ all:: subs
 @ALL_CMT@	$(MAKE) progs
 @ALL_CMT@	$(MAKE) docs
 
+all-static::
+	$(MAKE) libs
+@ALL_CMT@	$(MAKE) static-progs
+
 subs: $(DEP_SUBSTITUTE)
 	@for i in $(SUBS) ; do if test -d `dirname $$i` ; \
 		then $(MAKE) $$i || exit $$? ; fi ; done
@@ -41,10 +49,20 @@ subs: $(DEP_SUBSTITUTE)
 	@(if test -d lib/support ; then cd lib/support && $(MAKE) prof_err.h; fi)
 
 progs: all-progs-recursive
+static-progs: all-static-progs-recursive
 libs: all-libs-recursive
-all-progs-recursive all-libs-recursive: subs
+all-progs-recursive all-libs-recursive:: subs
+
+e2fsprogs-RHEL-6.spec: $(DEP_SUBSTITUTE) e2fsprogs-RHEL-6.spec.in
+	cd $(top_builddir); CONFIG_FILES=./e2fsprogs-RHEL-6.spec ./config.status
 
-rpm:
+e2fsprogs-SUSE_LINUX-11+.spec: $(DEP_SUBSTITUTE) e2fsprogs-SUSE_LINUX-11+.spec.in
+	cd $(top_builddir); CONFIG_FILES=./e2fsprogs-SUSE_LINUX-11+.spec ./config.status
+
+e2fsprogs-RHEL-7+.spec: $(DEP_SUBSTITUTE) e2fsprogs-RHEL-7+.spec.in
+	cd $(top_builddir); CONFIG_FILES=./e2fsprogs-RHEL-7+.spec ./config.status
+
+rpm: e2fsprogs-RHEL-6.spec e2fsprogs-SUSE_LINUX-11+.spec e2fsprogs-RHEL-7+.spec
 	sh contrib/build-rpm
 
 docs:
@@ -64,7 +82,7 @@ distclean-doc:
 
 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
+@SUBSET_CMT@	$(MAKE) install-libs
 
 install-strip: subs all-libs-recursive install-strip-progs-recursive \
   install-shlibs-strip-libs-recursive install-doc-libs
@@ -91,19 +109,24 @@ TAGS clean-recursive distclean-recursive depend-recursive fullcheck-recursive \
 	done
 
 all-progs-recursive install-progs-recursive install-strip-progs-recursive \
-  uninstall-progs-recursive coverage.txt-progs-recursive: all-libs-recursive
-	@for subdir in $(PROG_SUBDIRS); do \
-	  if test -d $$subdir ; then \
-	    target=`echo $@|$(SED) 's/-progs-recursive//'`; \
-	    echo making $$target in $$subdir; \
-	    (cd $$subdir && $(MAKE) $$target) || exit 1; \
-	  fi ; \
-	done
+  uninstall-progs-recursive coverage.txt-progs-recursive:: all-libs-recursive
+
+
+@ALL_CMT@all-progs-recursive all-static-progs-recursive install-progs-recursive \
+@ALL_CMT@  install-strip-progs-recursive uninstall-progs-recursive \
+@ALL_CMT@  coverage.txt-progs-recursive:: all-libs-recursive
+@ALL_CMT@	@for subdir in $(PROG_SUBDIRS); do \
+@ALL_CMT@	  if test -d $$subdir ; then \
+@ALL_CMT@	    target=`echo $@|$(SED) 's/-progs-recursive//'`; \
+@ALL_CMT@	    echo making $$target in $$subdir; \
+@ALL_CMT@	    (cd $$subdir && $(MAKE) $$target) || exit 1; \
+@ALL_CMT@	  fi ; \
+@ALL_CMT@	done
 
 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 \
-  coverage.txt-libs-recursive:
+  coverage.txt-libs-recursive::
 	@for subdir in $(LIB_SUBDIRS); do \
 	  if test -d $$subdir ; then \
 	    target=`echo $@|$(SED) 's/-libs-recursive//'`; \