Merge tag 'android-7.1.2_r39' into nougat-x86

[android-x86/external-e2fsprogs.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 8fe2a03..f327d19 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -7,14 +7,20 @@ INSTALL = @INSTALL@
 
 @MCONFIG@
 
+% : %.sh
+
 @RESIZER_CMT@RESIZE_DIR= resize
 @DEBUGFS_CMT@DEBUGFS_DIR= debugfs
+@UUID_CMT@UUID_LIB_SUBDIR= lib/uuid
+@BLKID_CMT@BLKID_LIB_SUBDIR= lib/blkid
+QUOTA_LIB_SUBDIR= lib/quota
 
-LIB_SUBDIRS=lib/et lib/ss lib/e2p lib/ext2fs lib/uuid lib/blkid intl
+LIB_SUBDIRS=lib/et lib/ss lib/e2p $(UUID_LIB_SUBDIR) lib/ext2fs $(BLKID_LIB_SUBDIR) $(QUOTA_LIB_SUBDIR) intl
 PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs po
 SUBDIRS=util $(LIB_SUBDIRS) $(PROG_SUBDIRS) tests
 
-SUBS= lib/ext2fs/ext2_types.h lib/blkid/blkid_types.h lib/uuid/uuid_types.h
+SUBS= util/subst.conf lib/config.h lib/dirpaths.h \
+       lib/ext2fs/ext2_types.h lib/blkid/blkid_types.h lib/uuid/uuid_types.h
 
 TAR=tar
 
@@ -23,11 +29,15 @@ all:: subs
        $(MAKE) progs
        $(MAKE) docs
 
-subs:
-       @for i in $(SUBS) ; do if test -d `dirname $$i` ; then $(MAKE) $$i ; fi ; done
+subs: $(DEP_SUBSTITUTE)
+       @for i in $(SUBS) ; do if test -d `dirname $$i` ; \
+               then $(MAKE) $$i || exit $$? ; fi ; done
+       @(if test -d lib/et ; then cd lib/et && $(MAKE) compile_et; fi)
+       @(if test -d lib/ext2fs ; then cd lib/ext2fs && $(MAKE) ext2_err.h; fi)
 
-progs: subs all-progs-recursive
-libs: subs all-libs-recursive
+progs: all-progs-recursive
+libs: all-libs-recursive
+all-progs-recursive all-libs-recursive: subs
 
 e2fsprogs.spec: $(DEP_SUBSTITUTE) e2fsprogs.spec.in
        cd $(top_builddir); CONFIG_FILES=./e2fsprogs.spec ./config.status
@@ -63,6 +73,8 @@ install-libs: install-libs-recursive
 
 uninstall-libs: uninstall-libs-recursive
 
+check-recursive: all
+
 TAGS clean-recursive distclean-recursive depend-recursive check-recursive \
   mostlyclean-recursive realclean-recursive:
        @for subdir in $(SUBDIRS); do \
@@ -74,7 +86,7 @@ TAGS clean-recursive distclean-recursive depend-recursive check-recursive \
        done
 
 all-progs-recursive install-progs-recursive install-strip-progs-recursive \
-  uninstall-progs-recursive:
+  uninstall-progs-recursive: all-libs-recursive
        @for subdir in $(PROG_SUBDIRS); do \
          if test -d $$subdir ; then \
            target=`echo $@|$(SED) 's/-progs-recursive//'`; \
@@ -132,5 +144,5 @@ distclean-local: clean-local
 realclean-local: distclean-local
        $(RM) -f configure
 
-check::        subs check-recursive
+check::        all check-recursive