Merge branch 'maint' into next

[thirdparty/e2fsprogs.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 0d0745c13107eea40146a212a2f6104cba08825d..61f2ebad30a21a2b0bee90b85fbcc2784ce728a8 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -13,10 +13,17 @@ INSTALL = @INSTALL@
 @DEBUGFS_CMT@DEBUGFS_DIR= debugfs
 @UUID_CMT@UUID_LIB_SUBDIR= lib/uuid
 @BLKID_CMT@BLKID_LIB_SUBDIR= lib/blkid
-SUPPORT_LIB_SUBDIR= lib/support
+@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
+
+PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs po \
+       $(E2SCRUB_DIR)
 
-LIB_SUBDIRS=lib/et lib/ss lib/e2p $(UUID_LIB_SUBDIR) $(BLKID_LIB_SUBDIR) $(SUPPORT_LIB_SUBDIR) lib/ext2fs intl
-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 \
@@ -26,8 +33,8 @@ TAR=tar
 
 all:: subs
        $(MAKE) libs
-       $(MAKE) progs
-       $(MAKE) docs
+@ALL_CMT@      $(MAKE) progs
+@ALL_CMT@      $(MAKE) docs
 
 subs: $(DEP_SUBSTITUTE)
        @for i in $(SUBS) ; do if test -d `dirname $$i` ; \