Merge branch 'maint' into next

[thirdparty/e2fsprogs.git] / util / Makefile.in

diff --git a/util/Makefile.in b/util/Makefile.in
index 634cd7536349585dfa19f44c2c4d3613c7c63201..5171c1ccf706218f8427122029f77085cca2047b 100644 (file)
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -14,29 +14,46 @@ SRCS = $(srcdir)/subst.c
 @MCONFIG@
 
 .c.o:
-       @echo " CC $<"
-       @$(BUILD_CC) -c $(ALL_CFLAGS) $< -o $@
+       $(E) "  CC $<"
+       $(Q) $(BUILD_CC) -c $(BUILD_CFLAGS) $< -o $@
+       $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
+       $(Q) $(CPPCHECK_CMD) $(CPPFLAGS) $<
 
-PROGS=         subst
+PROGS=         subst symlinks
 
 all:: $(PROGS) gen-tarball
 
+dirpaths.h:
+       $(E) "  CREATE dirpaths.h"
+       $(Q) echo "/* fake dirpaths.h for config.h */" > dirpaths.h
+
+subst.o: dirpaths.h
+
 subst: subst.o
-       @echo " LD $@"
-       @$(BUILD_CC) $(ALL_LDFLAGS) -o subst subst.o
+       $(E) "  LD $@"
+       $(Q) $(BUILD_CC) $(BUILD_LDFLAGS) -o subst subst.o
+
+copy_sparse: copy_sparse.o
+       $(E) "  LD $@"
+       $(Q) $(BUILD_CC) $(BUILD_LDFLAGS) -o copy_sparse copy_sparse.o
+
+symlinks: symlinks.o
+       $(E) "  LD $@"
+       $(Q) $(BUILD_CC) $(BUILD_LDFLAGS) -o symlinks symlinks.o
 
 gen-tarball: $(srcdir)/gen-tarball.in $(top_builddir)/config.status
-       @echo " CONFIG.STATUS $@"
-       @cd $(top_builddir); CONFIG_FILES=util/gen-tarball ./config.status
-       @chmod +x gen-tarball
+       $(E) "  CONFIG.STATUS $@"
+       $(Q) cd $(top_builddir); CONFIG_FILES=util/gen-tarball ./config.status
+       $(Q) chmod +x gen-tarball
 
 tarballs: gen-tarball
        sh gen-tarball debian
        sh gen-tarball all
        sh gen-tarball subset
 
-clean:
-       $(RM) -f $(PROGS) \#* *.s *.o *.a *~ core *.tar.gz gen-tarball
+clean::
+       $(RM) -f $(PROGS) \#* *.s *.o *.a *~ core *.tar.gz gen-tarball \
+               copy-sparse dirpaths.h
 
 mostlyclean: clean
 
@@ -48,4 +65,4 @@ distclean: clean
 # Makefile dependencies follow.  This must be the last section in
 # the Makefile.in file
 #
-subst.o: $(srcdir)/subst.c
+subst.o: $(srcdir)/subst.c $(top_builddir)/lib/config.h dirpaths.h