From: Theodore Ts'o <tytso@mit.edu>
Date: Sun, 19 Aug 2018 03:22:53 +0000 (-0400)
Subject: Merge branch 'maint' into next
X-Git-Tag: v1.45.0~47
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=6ac81e4526a4e1305aa5b976a3a2b7058c7509a5;p=tools%2Fe2fsprogs.git

Merge branch 'maint' into next
---

6ac81e4526a4e1305aa5b976a3a2b7058c7509a5
diff --cc Makefile.in
index ddd94ec,745e859..61f2eba
--- a/Makefile.in
+++ b/Makefile.in
@@@ -13,11 -13,14 +13,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
- SUPPORT_LIB_SUBDIR= lib/support
+ @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
++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 $(E2SCRUB_DIR)
  SUBDIRS=util $(LIB_SUBDIRS) $(PROG_SUBDIRS) tests
  
  SUBS= util/subst.conf lib/config.h $(top_builddir)/lib/dirpaths.h \