xfstests: fix depend targets

[xfstests-dev.git] / include / buildrules

diff --git a/include/buildrules b/include/buildrules
index f7212831058d9f9eaf229603808c735f7d5af365..d8ef6b1eae50e3bf1ed4a7efe4c1e1bd7d1125c5 100644 (file)
--- a/include/buildrules
+++ b/include/buildrules
@@ -6,16 +6,22 @@ _BUILDRULES_INCLUDED_ = 1
 
 include $(TOPDIR)/include/builddefs
 
-clean clobber : $(SUBDIRS)
-       rm -f $(DIRT)
-       @rm -fr .libs
-       $(SUBDIRS_MAKERULE)
+clean clobber : $(addsuffix -clean,$(SUBDIRS))
+       $(Q)rm -f $(DIRT)
+       $(Q)rm -fr .libs .ltdep .dep
+
+%-clean:
+       @echo "Cleaning $*"
+       $(Q)$(MAKE) $(MAKEOPTS) -q -C $* clean || $(MAKE) $(MAKEOPTS) -C $* clean
 
 # Never blow away subdirs
 ifdef SUBDIRS
 .PRECIOUS: $(SUBDIRS)
+.PHONY: $(SUBDIRS)
+
 $(SUBDIRS):
-       $(SUBDIRS_MAKERULE)
+       @echo "Building $@"
+       $(Q)$(MAKE) $(MAKEOPTS) -q -C $@ || $(MAKE) $(MAKEOPTS) -C $@
 endif
 
 #
@@ -24,26 +30,34 @@ endif
 
 ifdef LTCOMMAND
 $(LTCOMMAND) : $(SUBDIRS) $(OBJECTS) $(LTDEPENDENCIES)
-       $(LTLINK) -o $@ $(LDFLAGS) $(OBJECTS) $(LDLIBS)
+       @echo "    [LD] $*"
+       $(Q)$(LTLINK) -o $@ $(LDFLAGS) $(OBJECTS) $(LDLIBS)
 endif
 
 ifdef LTLIBRARY
 $(LTLIBRARY) : $(SUBDIRS) $(LTOBJECTS)
-       $(LTLINK) $(LTLDFLAGS) -o $(LTLIBRARY) $(LTOBJECTS) $(LTLIBS)
+       @echo "    [LD] $*"
+       $(Q)$(LTLINK) $(LTLDFLAGS) -o $(LTLIBRARY) $(LTOBJECTS) $(LTLIBS)
 
 %.lo: %.c
-       $(LTCOMPILE) -c $<
+       @echo "    [CC] $@"
+       $(Q)$(LTCOMPILE) -c $<
+else
+%.o: %.c
+       @echo "    [CC] $@"
+       $(Q)$(CC) $(CFLAGS) -c $<
+
 endif
 
-ifdef LINGUAS
+ifdef POTHEAD
 %.pot: $(XGETTEXTFILES)
-       xgettext --omit-header --language=C --keyword=_ -o $@ $(XGETTEXTFILES)
+       $(XGETTEXT) --language=C --keyword=_ -o $@ $(XGETTEXTFILES)
 
-%.po:
-       $(MSGMERGE) -o $@.tmpo $@ $(PKG_NAME).pot
-       @if ! diff $@.tmpo $@ >/dev/null; then \
-               echo "$@ is out of date, see $@.tmpo"; \
-       fi
+# Generate temp .po files, to check whether translations need updating.
+# Not by default, due to gettext output differences between versions.
+%.po: $(POTHEAD)
+#      $(MSGMERGE) -o $@.tmpo $@ $(POTHEAD)
+#      if ! diff $@.tmpo $@ >/dev/null; then echo "$@ dated, see $@.tmpo"; fi
 
 %.mo: %.po
        $(MSGFMT) -o $@ $<
@@ -56,22 +70,22 @@ endif # _BUILDRULES_INCLUDED_
 
 $(_FORCE):
 
-.PHONY : depend
-
-depend : $(CFILES) $(HFILES)
-       $(SUBDIRS_MAKERULE)
-       touch .dep
-       $(MAKEDEPEND) $(DEPENDFLAGS) -f - -- $(CFLAGS) -- $(CFILES) | \
-       $(SED) -e 's,`pwd`,$(TOPDIR),g' \
-           -e 's,  */[^ ]*,,g' \
-           -e '/^[^ ]*: *$$/d' \
-           -e '/^#.*/d' -e '/^ *$$/d' \
-       > .dep
-       test -s .dep || rm -f .dep
-
-# Include dep, but only if it exists
-ifeq ($(shell test -f .dep && echo .dep), .dep)
-include .dep
-else
-$(OBJECTS): $(HFILES)
-endif
+# dependency build is automatic, relies on gcc -MM to generate.
+.PHONY : depend ltdepend
+
+MAKEDEP := $(MAKEDEPEND) $(CFLAGS)
+
+ltdepend: .ltdep
+
+.ltdep: $(CFILES) $(HFILES)
+       @echo "    [LTDEP]"
+       $(Q)[ -n "$(CFILES)" ] && \
+           $(MAKEDEP) $(CFILES) | $(SED) -e 's,^\([^:]*\)\.o,\1.lo,' > .ltdep
+
+depend: .dep
+
+.dep: $(CFILES) $(HFILES)
+       @echo "    [DEP]"
+       $(Q)[ -n "$(CFILES)" ] && \
+           $(MAKEDEP) $(CFILES) | $(SED) -e 's,^\([^:]*\)\.o,\1,' > .dep
+