From fc42f894fe28e03f86708064b15c833a2b6df57c Mon Sep 17 00:00:00 2001 From: qwell Date: Tue, 19 Jan 2010 17:42:42 +0000 Subject: Merged revisions 241230 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r241230 | qwell | 2010-01-19 11:42:10 -0600 (Tue, 19 Jan 2010) | 10 lines Allow parallel make (-j) to work properly. After some back and forth with the reporter, we came up with the necessary changes. (closes issue #16489) Reported by: Chainsaw Patches: asterisk-1.6.2.1-parallel-make-minimal.patch uploaded by Chainsaw (license 723) Tested by: Chainsaw, qwell ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@241231 f38db490-d61c-443f-a65b-d21fe96a405b --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index a04efe848..609f08f10 100644 --- a/Makefile +++ b/Makefile @@ -550,7 +550,7 @@ bininstall: _all installdirs $(SUBDIRS_INSTALL) fi $(SUBDIRS_INSTALL): - @DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(SUBMAKE) -C $(@:-install=) install + +@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(SUBMAKE) -C $(@:-install=) install NEWMODS:=$(foreach d,$(MOD_SUBDIRS),$(notdir $(wildcard $(d)/*.so))) OLDMODS=$(filter-out $(NEWMODS),$(notdir $(wildcard $(DESTDIR)$(MODULES_DIR)/*.so))) @@ -803,7 +803,7 @@ cleantest: @cmp -s .cleancount .lastclean || $(MAKE) clean $(SUBDIRS_UNINSTALL): - @$(SUBMAKE) -C $(@:-uninstall=) uninstall + +@$(SUBMAKE) -C $(@:-uninstall=) uninstall _uninstall: $(SUBDIRS_UNINSTALL) rm -f $(DESTDIR)$(MODULES_DIR)/* -- cgit v1.2.3