diff options
author | Barry Naujok <bnaujok@sgi.com> | 2008-11-21 02:43:35 +0000 |
---|---|---|
committer | Barry Naujok <bnaujok@sgi.com> | 2008-11-21 02:43:35 +0000 |
commit | 01c13551a0185ab70f270addaf0c6dccbbba211b (patch) | |
tree | cfebc2965cc435e0b182215f4b7b74ff90aac460 /include | |
parent | c9a5cfd7eb10d90d79725f1edd00374f3c4a475a (diff) | |
download | attr-01c13551a0185ab70f270addaf0c6dccbbba211b.tar.gz |
Allow parallel builds of xfs-cmds.
Merge of master-melb:xfs-cmds:32514a by kenmcd.
Allow parallel builds of xfs-cmds
Diffstat (limited to 'include')
-rw-r--r-- | include/buildmacros | 8 | ||||
-rw-r--r-- | include/buildrules | 16 |
2 files changed, 11 insertions, 13 deletions
diff --git a/include/buildmacros b/include/buildmacros index 00da8a9..db761b4 100644 --- a/include/buildmacros +++ b/include/buildmacros @@ -123,14 +123,6 @@ INSTALL_LINGUAS = \ done endif -SUBDIRS_MAKERULE = \ - @for d in $(SUBDIRS) ""; do \ - if test -d "$$d" -a ! -z "$$d"; then \ - $(ECHO) === $$d ===; \ - $(MAKEF) -C $$d $@ || exit $$?; \ - fi; \ - done - MAN_MAKERULE = \ @for f in *.[12345678] ""; do \ if test ! -z "$$f"; then \ diff --git a/include/buildrules b/include/buildrules index 4a91fee..e509833 100644 --- a/include/buildrules +++ b/include/buildrules @@ -6,16 +6,20 @@ _BUILDRULES_INCLUDED_ = 1 include $(TOPDIR)/include/builddefs -clean clobber : $(SUBDIRS) +clean clobber : $(addsuffix -clean,$(SUBDIRS)) rm -f $(DIRT) @rm -fr .libs - $(SUBDIRS_MAKERULE) + +%-clean: + $(MAKE) -C $* clean # Never blow away subdirs ifdef SUBDIRS .PRECIOUS: $(SUBDIRS) +.PHONY: $(SUBDIRS) + $(SUBDIRS): - $(SUBDIRS_MAKERULE) + $(MAKE) -C $@ endif # @@ -68,11 +72,13 @@ ifdef LTLIBRARY DEPENDSCRIPT := $(DEPENDSCRIPT) | $(SED) -e 's,^\([^:]*\)\.o,\1.lo,' endif -depend : $(CFILES) $(HFILES) - $(SUBDIRS_MAKERULE) +depend : $(CFILES) $(HFILES) $(addsuffix -depend,$(SUBDIRS)) $(DEPENDSCRIPT) > .dep test -s .dep || rm -f .dep +%-depend: + $(MAKE) -C $* depend + # Include dep, but only if it exists ifeq ($(shell test -f .dep && echo .dep), .dep) include .dep |