xfsprogs: fix depend targets

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@sgi.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>

diff --git a/Makefile b/Makefile
index 68025e5b426db9032daf8049d5e6e5885435897d..9d98bb00a1eba9a6e2e535d12c09786ca4aa15a2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -30,9 +30,9 @@ SRCTAR = $(PKG_NAME)-$(PKG_VERSION).tar.gz
 CONFIGURE = aclocal.m4 configure config.guess config.sub install-sh ltmain.sh
 LSRCFILES = configure.in release.sh README VERSION $(CONFIGURE)
 
-LDIRT = config.log .dep config.status config.cache confdefs.h conftest* \
-       built .census install.* install-dev.* *.gz autom4te.cache/* libtool \
-       include/builddefs include/platform_defs.h
+LDIRT = config.log .ltdep .dep config.status config.cache confdefs.h \
+       conftest* built .census install.* install-dev.* *.gz \
+       autom4te.cache/* libtool include/builddefs include/platform_defs.h
 
 ifeq ($(HAVE_BUILDDEFS), yes)
 LDIRDIRT = $(SRCDIR)

diff --git a/include/buildrules b/include/buildrules
index 77d4c1a4a8ac53e1da818c6c65b5a8a36796ece4..f53b5ee4dc54e8c28cf9854a65d217f6c26e6828 100644 (file)
--- a/include/buildrules
+++ b/include/buildrules
@@ -7,7 +7,7 @@ _BUILDRULES_INCLUDED_ = 1
 include $(TOPDIR)/include/builddefs
 
 clean clobber : $(addsuffix -clean,$(SUBDIRS))
-       @rm -f $(DIRT) .dep
+       @rm -f $(DIRT) .ltdep .dep
        @rm -fr $(DIRDIRT)
 %-clean:
        @echo "Cleaning $*"
@@ -94,10 +94,14 @@ $(_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)$(MAKEDEP) $(CFILES) | $(SED) -e 's,^\([^:]*\)\.o,\1.lo,' > .ltdep
+
+depend: .dep
 
-depend: $(CFILES) $(HFILES)
+.dep: $(CFILES) $(HFILES)
        @echo "    [DEP]"
        $(Q)$(MAKEDEP) $(CFILES) > .dep

diff --git a/libdisk/Makefile b/libdisk/Makefile
index 32416a5b6bef2af9edac3af777bd146c53c0a906..f56f3b491dfd69bbe9e37ea8cd5dc06276cf7ad6 100644 (file)
--- a/libdisk/Makefile
+++ b/libdisk/Makefile
@@ -30,4 +30,4 @@ install-dev: default
 
 install-qa: install-dev
 
--include .dep
+-include .ltdep

diff --git a/libhandle/Makefile b/libhandle/Makefile
index 9422c344c74807e0bb738923ddb5a13606c88258..865ca221e29d3d09e387c37a746bc2a256628b41 100644 (file)
--- a/libhandle/Makefile
+++ b/libhandle/Makefile
@@ -27,4 +27,4 @@ install-dev: default
 
 install-qa: install-dev
 
--include .dep
+-include .ltdep

diff --git a/libxcmd/Makefile b/libxcmd/Makefile
index 60b6f9ed6ca72a9c8c71aa7bfd62f54197be3143..b3544f42cc373b3a2911b4f1756a0306decf1148 100644 (file)
--- a/libxcmd/Makefile
+++ b/libxcmd/Makefile
@@ -34,4 +34,4 @@ include $(BUILDRULES)
 
 install install-dev install-qa: default
 
--include .dep
+-include .ltdep

diff --git a/libxfs/Makefile b/libxfs/Makefile
index 5088b5513154fcfc88308271de63564d827828c7..990cbf7ec49b4922230a643c29a366aff8e59f00 100644 (file)
--- a/libxfs/Makefile
+++ b/libxfs/Makefile
@@ -48,4 +48,4 @@ install-dev: default
 
 install-qa: default
 
--include .dep
+-include .ltdep

diff --git a/libxlog/Makefile b/libxlog/Makefile
index 7358fb1333c92dc692502761c459c15f7c22fb8a..4673663877542617aa453fa116fdcd2bac822dcb 100644 (file)
--- a/libxlog/Makefile
+++ b/libxlog/Makefile
@@ -21,4 +21,4 @@ include $(BUILDRULES)
 
 install install-dev install-qa: default
 
--include .dep
+-include .ltdep