* [PATCH] xfsdump: fix depend targets
@ 2010-07-30 21:48 Alex Elder
2010-08-02 23:13 ` Dave Chinner
0 siblings, 1 reply; 2+ messages in thread
From: Alex Elder @ 2010-07-30 21:48 UTC (permalink / raw)
To: xfs
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>
---
Makefile | 6 +++---
dump/Makefile | 2 +-
include/buildrules | 16 ++++++++++------
inventory/Makefile | 2 +-
librmt/Makefile | 2 +-
restore/Makefile | 2 +-
6 files changed, 17 insertions(+), 13 deletions(-)
Index: b/Makefile
===================================================================
--- a/Makefile
+++ b/Makefile
@@ -30,9 +30,9 @@ SRCTAR = $(PKG_NAME)-$(PKG_VERSION).tar.
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/config.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/config.h
ifeq ($(HAVE_BUILDDEFS), yes)
LDIRDIRT = $(SRCDIR)
Index: b/dump/Makefile
===================================================================
--- a/dump/Makefile
+++ b/dump/Makefile
@@ -105,7 +105,7 @@ install: default
$(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND)
install-dev:
-depend: $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON)
+.dep: $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON)
$(COMMINCL) $(COMMON):
@echo " [LN] $@"
Index: b/include/buildrules
===================================================================
--- 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
+ $(Q)[ -n "$(CFILES)" ] && $(MAKEDEP) $(CFILES) > .dep
Index: b/inventory/Makefile
===================================================================
--- a/inventory/Makefile
+++ b/inventory/Makefile
@@ -13,4 +13,4 @@ default install install-dev:
include $(BUILDRULES)
--include .dep
+-include .ltdep
Index: b/librmt/Makefile
===================================================================
--- a/librmt/Makefile
+++ b/librmt/Makefile
@@ -21,4 +21,4 @@ include $(BUILDRULES)
install install-dev: default
--include .dep
+-include .ltdep
Index: b/restore/Makefile
===================================================================
--- a/restore/Makefile
+++ b/restore/Makefile
@@ -117,7 +117,7 @@ install: default
$(INSTALL) -S $(PKG_ROOT_SBIN_DIR)/$(LTCOMMAND) $(PKG_SBIN_DIR)/$(LTCOMMAND)
install-dev:
-depend: $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON)
+.dep: $(COMMINCL) $(COMMON) $(INVINCL) $(INVCOMMON)
$(COMMINCL) $(COMMON):
@echo " [LN] $@"
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] xfsdump: fix depend targets
2010-07-30 21:48 [PATCH] xfsdump: fix depend targets Alex Elder
@ 2010-08-02 23:13 ` Dave Chinner
0 siblings, 0 replies; 2+ messages in thread
From: Dave Chinner @ 2010-08-02 23:13 UTC (permalink / raw)
To: Alex Elder; +Cc: xfs
On Fri, Jul 30, 2010 at 04:48:47PM -0500, Alex Elder wrote:
> 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>
--
Dave Chinner
david@fromorbit.com
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-08-02 23:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-30 21:48 [PATCH] xfsdump: fix depend targets Alex Elder
2010-08-02 23:13 ` Dave Chinner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox