Whamcloud - gitweb
Merge branch 'maint' into next
authorTheodore Ts'o <tytso@mit.edu>
Sun, 19 Aug 2018 03:22:53 +0000 (23:22 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Sun, 19 Aug 2018 03:22:53 +0000 (23:22 -0400)
1  2 
Makefile.in
configure
configure.ac
debian/control
debian/rules

diff --cc 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
- SUPPORT_LIB_SUBDIR= lib/support
 +@E2SCRUB_CMT@E2SCRUB_DIR= scrub
 -PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs po
+ @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
- 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)
++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 \
diff --cc configure
Simple merge
diff --cc configure.ac
Simple merge
diff --cc debian/control
Simple merge
diff --cc debian/rules
Simple merge