From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by oss.sgi.com (8.12.11.20060308/8.12.11/SuSE Linux 0.7) with ESMTP id mAI3wroD016970 for ; Mon, 17 Nov 2008 19:58:53 -0800 Received: from sandeen.net (localhost [127.0.0.1]) by cuda.sgi.com (Spam Firewall) with ESMTP id 458B41592591 for ; Mon, 17 Nov 2008 19:58:44 -0800 (PST) Received: from sandeen.net (sandeen.net [209.173.210.139]) by cuda.sgi.com with ESMTP id UoZ8RCIz0JAjaPrj for ; Mon, 17 Nov 2008 19:58:44 -0800 (PST) Received: from liberator.sandeen.net (liberator.sandeen.net [10.0.0.4]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by sandeen.net (Postfix) with ESMTP id 4CD3EA8408B for ; Mon, 17 Nov 2008 21:58:44 -0600 (CST) Message-ID: <49223D74.2050509@sandeen.net> Date: Mon, 17 Nov 2008 21:58:44 -0600 From: Eric Sandeen MIME-Version: 1.0 Subject: [PATCH 4/7] dmapi parallel build References: <49223C13.2080507@sandeen.net> In-Reply-To: <49223C13.2080507@sandeen.net> List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xfs-bounces@oss.sgi.com Errors-To: xfs-bounces@oss.sgi.com To: xfs-oss Allow parallel builds of the dmapi package Signed-off-by: Eric Sandeen --- Index: xfs-cmds/dmapi/Makefile =================================================================== --- xfs-cmds.orig/dmapi/Makefile +++ xfs-cmds/dmapi/Makefile @@ -15,22 +15,28 @@ LSRCFILES = configure configure.in acloc LDIRT = config.log .dep config.status config.cache confdefs.h conftest* \ Logs/* built .census install.* install-dev.* *.gz -SUBDIRS = include libdm m4 man doc debian build +LIB_SUBDIRS = include libdm +TOOL_SUBDIRS = m4 man doc debian build -default: $(CONFIGURE) +SUBDIRS = $(LIB_SUBDIRS) $(TOOL_SUBDIRS) + +default: include/builddefs ifeq ($(HAVE_BUILDDEFS), no) $(MAKE) -C . $@ else - $(SUBDIRS_MAKERULE) + $(MAKE) $(SUBDIRS) endif +# tool/lib dependencies +# There don't appear to be any dependencies between subdirs + ifeq ($(HAVE_BUILDDEFS), yes) include $(BUILDRULES) else clean: # if configure hasn't run, nothing to clean endif -$(CONFIGURE): +include/builddefs: autoconf ./configure \ --prefix=/ \ @@ -49,15 +55,19 @@ $(CONFIGURE): aclocal.m4:: aclocal --acdir=`pwd`/m4 --output=$@ -install: default - $(SUBDIRS_MAKERULE) +install: default $(addsuffix -install,$(SUBDIRS)) ifneq ($(PKG_DISTRIBUTION), debian) $(INSTALL) -m 755 -d $(PKG_DOC_DIR) $(INSTALL) -m 644 README $(PKG_DOC_DIR) endif -install-dev: default - $(SUBDIRS_MAKERULE) +install-dev: default $(addsuffix -install-dev,$(SUBDIRS)) + +%-install: + $(MAKE) -C $* install + +%-install-dev: + $(MAKE) -C $* install-dev realclean distclean: clean rm -f $(LDIRT) $(CONFIGURE) Index: xfs-cmds/dmapi/include/buildmacros =================================================================== --- xfs-cmds.orig/dmapi/include/buildmacros +++ xfs-cmds/dmapi/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 \ Index: xfs-cmds/dmapi/include/buildrules =================================================================== --- xfs-cmds.orig/dmapi/include/buildrules +++ xfs-cmds/dmapi/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 Index: xfs-cmds/dmapi/man/Makefile =================================================================== --- xfs-cmds.orig/dmapi/man/Makefile +++ xfs-cmds/dmapi/man/Makefile @@ -7,7 +7,16 @@ include $(TOPDIR)/include/builddefs SUBDIRS = man3 -default install install-dev : $(SUBDIRS) - $(SUBDIRS_MAKERULE) +default : $(SUBDIRS) + +install : $(addsuffix -install,$(SUBDIRS)) + +install-dev : $(addsuffix -install-dev,$(SUBDIRS)) + +%-install: + $(MAKE) -C $* install + +%-install-dev: + $(MAKE) -C $* install-dev include $(BUILDRULES) _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs