diff options
| author | Barry Naujok <bnaujok@sgi.com> | 2008-11-21 02:44:04 +0000 |
|---|---|---|
| committer | Barry Naujok <bnaujok@sgi.com> | 2008-11-21 02:44:04 +0000 |
| commit | 4877dfbf86bac073a45eacf2fee0a8c21079a34c (patch) | |
| tree | d402f7d71247ae5399332293d9679d115a28b9ad /include | |
| parent | e5b8ad3181063d184de595533a83fdaf3f7dcedb (diff) | |
Allow parallel builds of the xfstests package
Merge of master-melb:xfs-cmds:32515a by kenmcd.
Allow parallel builds of the xfstests package
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 b2559efc..801bcb61 100644 --- a/include/buildmacros +++ b/include/buildmacros @@ -122,14 +122,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 4a91fee3..e509833d 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 |