LU-13197 e2fsck: consistently use ext2fs_get_mem()

[tools/e2fsprogs.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 80ab299..f4d8b06 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -13,6 +13,7 @@ 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
@@ -20,7 +21,9 @@ INSTALL = @INSTALL@
 LIB_SUBDIRS=lib/et lib/ss $(E2P_LIB_SUBDIR) $(UUID_LIB_SUBDIR) \
        $(BLKID_LIB_SUBDIR) $(SUPPORT_LIB_SUBDIR) $(EXT2FS_LIB_SUBDIR) intl
 
-PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs po
+PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs po \
+       $(E2SCRUB_DIR)
+
 SUBDIRS=util $(LIB_SUBDIRS) $(PROG_SUBDIRS) tests
 
 SUBS= util/subst.conf lib/config.h $(top_builddir)/lib/dirpaths.h \
@@ -44,7 +47,16 @@ progs: all-progs-recursive
 libs: all-libs-recursive
 all-progs-recursive all-libs-recursive:: subs
 
-rpm:
+e2fsprogs-RHEL-6.spec: $(DEP_SUBSTITUTE) e2fsprogs-RHEL-6.spec.in
+       cd $(top_builddir); CONFIG_FILES=./e2fsprogs-RHEL-6.spec ./config.status
+
+e2fsprogs-SUSE_LINUX-11+12+15.spec: $(DEP_SUBSTITUTE) e2fsprogs-SUSE_LINUX-11+12+15.spec.in
+       cd $(top_builddir); CONFIG_FILES=./e2fsprogs-SUSE_LINUX-11+12+15.spec ./config.status
+
+e2fsprogs-RHEL-7+8.spec: $(DEP_SUBSTITUTE) e2fsprogs-RHEL-7+8.spec.in
+       cd $(top_builddir); CONFIG_FILES=./e2fsprogs-RHEL-7+8.spec ./config.status
+
+rpm: e2fsprogs-RHEL-6.spec e2fsprogs-SUSE_LINUX-11+12+15.spec e2fsprogs-RHEL-7+8.spec
        sh contrib/build-rpm
 
 docs:
@@ -64,7 +76,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