e2fsck: mark that we don't care about the return value of e2fsck_lookup()

[tools/e2fsprogs.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 80ab299..79b7116 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,6 +4,7 @@ VPATH = @srcdir@
 top_builddir = .
 my_dir = .
 INSTALL = @INSTALL@
+MKDIR_P = @MKDIR_P@
 
 @MCONFIG@
 
@@ -13,14 +14,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
 @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
+       $(BLKID_LIB_SUBDIR) $(SUPPORT_LIB_SUBDIR) $(EXT2FS_LIB_SUBDIR)
+
+PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs \
+       tests/fuzz po $(E2SCRUB_DIR)
 
-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 \
@@ -33,6 +37,10 @@ all:: subs
 @ALL_CMT@      $(MAKE) progs
 @ALL_CMT@      $(MAKE) docs
 
+all-static::
+       $(MAKE) libs
+@ALL_CMT@      $(MAKE) static-progs
+
 subs: $(DEP_SUBSTITUTE)
        @for i in $(SUBS) ; do if test -d `dirname $$i` ; \
                then $(MAKE) $$i || exit $$? ; fi ; done
@@ -41,6 +49,7 @@ subs: $(DEP_SUBSTITUTE)
        @(if test -d lib/support ; then cd lib/support && $(MAKE) prof_err.h; fi)
 
 progs: all-progs-recursive
+static-progs: all-static-progs-recursive
 libs: all-libs-recursive
 all-progs-recursive all-libs-recursive:: subs
 
@@ -64,7 +73,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
@@ -94,8 +103,9 @@ all-progs-recursive install-progs-recursive install-strip-progs-recursive \
   uninstall-progs-recursive coverage.txt-progs-recursive:: all-libs-recursive
 
 
-@ALL_CMT@all-progs-recursive install-progs-recursive install-strip-progs-recursive \
-@ALL_CMT@  uninstall-progs-recursive coverage.txt-progs-recursive:: all-libs-recursive
+@ALL_CMT@all-progs-recursive all-static-progs-recursive install-progs-recursive \
+@ALL_CMT@  install-strip-progs-recursive uninstall-progs-recursive \
+@ALL_CMT@  coverage.txt-progs-recursive:: all-libs-recursive
 @ALL_CMT@      @for subdir in $(PROG_SUBDIRS); do \
 @ALL_CMT@        if test -d $$subdir ; then \
 @ALL_CMT@          target=`echo $@|$(SED) 's/-progs-recursive//'`; \