xfs
[Top] [All Lists]

[PATCH] xfstests: fix depend targets

To: xfs@xxxxxxxxxxx
Subject: [PATCH] xfstests: fix depend targets
From: Alex Elder <aelder@xxxxxxx>
Date: Fri, 30 Jul 2010 16:49:48 -0500
User-agent: Heirloom mailx 12.4 7/29/08
There's no need to re-make the dependency files all the time.  Make
it so the "depend" target rebuilds the ".dep" file only if necessary.
Also change the name of the dependency file created for "ltdepend"
to be ".ltdep".

Signed-off-by: Alex Elder <aelder@xxxxxxx>

---
 Makefile           |    4 ++--
 include/buildrules |   18 ++++++++++++------
 lib/Makefile       |    2 +-
 3 files changed, 15 insertions(+), 9 deletions(-)

Index: b/Makefile
===================================================================
--- a/Makefile
+++ b/Makefile
@@ -27,8 +27,8 @@ endif
 TESTS = $(shell sed -n -e '/^[0-9][0-9][0-9]*/s/ .*//p' group)
 CONFIGURE = configure include/builddefs include/config.h
 LSRCFILES = configure configure.in aclocal.m4 README VERSION
-LDIRT = config.log .dep config.status config.cache confdefs.h conftest* \
-       check.log check.time
+LDIRT = config.log .ltdep .dep config.status config.cache confdefs.h \
+       conftest* check.log check.time
 
 ifeq ($(HAVE_DMAPI), true)
 DMAPI_MAKEFILE = dmapi/Makefile
Index: b/include/buildrules
===================================================================
--- a/include/buildrules
+++ b/include/buildrules
@@ -8,7 +8,7 @@ include $(TOPDIR)/include/builddefs
 
 clean clobber : $(addsuffix -clean,$(SUBDIRS))
        $(Q)rm -f $(DIRT)
-       $(Q)rm -fr .libs .dep
+       $(Q)rm -fr .libs .ltdep .dep
 
 %-clean:
        @echo "Cleaning $*"
@@ -75,11 +75,17 @@ $(_FORCE):
 
 MAKEDEP := $(MAKEDEPEND) $(CFLAGS)
 
-ltdepend: $(CFILES) $(HFILES)
-       @echo "    [DEP]"
-       $(Q)$(MAKEDEP) $(CFILES) | $(SED) -e 's,^\([^:]*\)\.o,\1.lo,' > .dep
+ltdepend: .ltdep
+
+.ltdep: $(CFILES) $(HFILES)
+       @echo "    [LTDEP]"
+       $(Q)[ -n "$(CFILES)" ] && \
+           $(MAKEDEP) $(CFILES) | $(SED) -e 's,^\([^:]*\)\.o,\1.lo,' > .ltdep
+
+depend: .dep
 
-depend: $(CFILES) $(HFILES)
+.dep: $(CFILES) $(HFILES)
        @echo "    [DEP]"
-       $(Q)$(MAKEDEP) $(CFILES) | $(SED) -e 's,^\([^:]*\)\.o,\1,' > .dep
+       $(Q)[ -n "$(CFILES)" ] && \
+           $(MAKEDEP) $(CFILES) | $(SED) -e 's,^\([^:]*\)\.o,\1,' > .dep
 
Index: b/lib/Makefile
===================================================================
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -25,4 +25,4 @@ include $(BUILDRULES)
 
 install install-dev: default
 
--include .dep
+-include .ltdep

<Prev in Thread] Current Thread [Next in Thread>
  • [PATCH] xfstests: fix depend targets, Alex Elder <=