xfs
[Top] [All Lists]

[PATCH 2/7] acl parallel build

To: xfs-oss <xfs@xxxxxxxxxxx>
Subject: [PATCH 2/7] acl parallel build
From: Eric Sandeen <sandeen@xxxxxxxxxxx>
Date: Mon, 17 Nov 2008 21:56:14 -0600
In-reply-to: <49223C13.2080507@sandeen.net>
References: <49223C13.2080507@sandeen.net>
User-agent: Thunderbird 2.0.0.17 (Macintosh/20080914)
Allow parallel builds of the acl package

Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxxx>
---

Index: xfs-cmds/acl/Makefile
===================================================================
--- xfs-cmds.orig/acl/Makefile
+++ xfs-cmds/acl/Makefile
@@ -16,23 +16,29 @@ LSRCFILES = configure configure.in acloc
 LDIRT = config.log .dep config.status config.cache confdefs.h conftest* \
        Logs/* built .census install.* install-dev.* install-lib.* *.gz
 
-SUBDIRS = include libmisc libacl getfacl setfacl chacl m4 man doc po \
-         test examples build debian
+LIB_SUBDIRS = include libmisc libacl
+TOOL_SUBDIRS = getfacl setfacl chacl m4 man doc po test examples build debian
 
-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
+libacl: libmisc
+getfacl setfacl chacl: libacl
+
 ifeq ($(HAVE_BUILDDEFS), yes)
 include $(BUILDRULES)
 else
 clean: # if configure hasn't run, nothing to clean
 endif
 
-$(CONFIGURE):
+include/builddefs:
        autoconf
        ./configure \
                --prefix=/ \
@@ -48,19 +54,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: default
-       $(SUBDIRS_MAKERULE)
+install-dev: default $(addsuffix -install-dev,$(SUBDIRS))
+
+install-lib: default $(addsuffix -install-lib,$(SUBDIRS))
+
+%-install:
+       $(MAKE) -C $* install
+
+%-install-lib:
+       $(MAKE) -C $* install-lib
 
-install-lib: default
-       $(SUBDIRS_MAKERULE)
+%-install-dev:
+       $(MAKE) -C $* install-dev
 
 realclean distclean: clean
        rm -f $(LDIRT) $(CONFIGURE)
Index: xfs-cmds/acl/include/buildrules
===================================================================
--- xfs-cmds.orig/acl/include/buildrules
+++ xfs-cmds/acl/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/acl/man/Makefile
===================================================================
--- xfs-cmds.orig/acl/man/Makefile
+++ xfs-cmds/acl/man/Makefile
@@ -7,7 +7,16 @@ include $(TOPDIR)/include/builddefs
 
 SUBDIRS = man1 man3 man5
 
-default install install-dev install-lib: $(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)
Index: xfs-cmds/acl/include/buildmacros
===================================================================
--- xfs-cmds.orig/acl/include/buildmacros
+++ xfs-cmds/acl/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 \

<Prev in Thread] Current Thread [Next in Thread>