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 | |
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
-rw-r--r-- | Makefile | 41 | ||||
-rw-r--r-- | include/buildmacros | 8 | ||||
-rw-r--r-- | include/buildrules | 16 | ||||
-rw-r--r-- | man/Makefile | 18 |
4 files changed, 59 insertions, 24 deletions
@@ -16,23 +16,30 @@ LSRCFILES = configure configure.in aclocal.m4 Makepkgs install-sh exports \ LDIRT = config.log .dep config.status config.cache confdefs.h conftest* \ Logs/* built .census install.* install-dev.* install-lib.* *.gz -SUBDIRS = include libmisc libattr attr getfattr setfattr \ - examples test m4 man doc po debian build +LIB_SUBDIRS = include libmisc libattr +TOOL_SUBDIRS = attr getfattr setfattr examples test m4 man doc po debian build -default: $(CONFIGURE) +SUBDIRS = $(LIB_SUBDIRS) $(TOOL_SUBDIRS) + +default: include/builddefs include/config.h ifeq ($(HAVE_BUILDDEFS), no) $(MAKE) -C . $@ else - $(SUBDIRS_MAKERULE) + $(MAKE) $(SUBDIRS) endif +# tool/lib dependencies +libattr: include +getfattr setfattr: libmisc libattr +attr: libattr + ifeq ($(HAVE_BUILDDEFS), yes) include $(BUILDRULES) else clean: # if configure hasn't run, nothing to clean endif -$(CONFIGURE): +include/builddefs: autoconf ./configure \ --prefix=/ \ @@ -48,16 +55,32 @@ $(CONFIGURE): $$LOCAL_CONFIGURE_OPTIONS touch .census +include/config.h: include/builddefs +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f include/builddefs; \ + $(MAKE) $(AM_MAKEFLAGS) include/builddefs; \ + fi + aclocal.m4:: aclocal --acdir=`pwd`/m4 --output=$@ -install: default - $(SUBDIRS_MAKERULE) +install: default $(addsuffix -install,$(SUBDIRS)) $(INSTALL) -m 755 -d $(PKG_DOC_DIR) $(INSTALL) -m 644 README $(PKG_DOC_DIR) -install-dev install-lib: default - $(SUBDIRS_MAKERULE) +install-dev: default $(addsuffix -install-dev,$(SUBDIRS)) + +install-lib: install $(addsuffix -install-lib,$(SUBDIRS)) + +%-install: + $(MAKE) -C $* install + +%-install-dev: + $(MAKE) -C $* install-dev + +%-install-lib: + $(MAKE) -C $* install-lib realclean distclean: clean rm -f $(LDIRT) $(CONFIGURE) 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 diff --git a/man/Makefile b/man/Makefile index 1a62e65..8b9fdf5 100644 --- a/man/Makefile +++ b/man/Makefile @@ -7,7 +7,21 @@ include $(TOPDIR)/include/builddefs SUBDIRS = man1 man2 man3 man5 -default install install-dev install-lib: $(SUBDIRS) - $(SUBDIRS_MAKERULE) +default : $(SUBDIRS) + +install : $(addsuffix -install,$(SUBDIRS)) + +install-dev : $(addsuffix -install-dev,$(SUBDIRS)) + +install-lib : $(addsuffix -install-lib,$(SUBDIRS)) + +%-install: + $(MAKE) -C $* install + +%-install-dev: + $(MAKE) -C $* install-dev + +%-install-lib: + $(MAKE) -C $* install-lib include $(BUILDRULES) |