kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-03 20:38:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 241230 via svnmerge from

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@241232 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker
2010-01-19 17:43:10 +00:00
parent 269e71bb24
commit b36efa71bf
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -552,7 +552,7 @@ bininstall: _all installdirs $(SUBDIRS_INSTALL)
fi fi
$(SUBDIRS_INSTALL): $(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))) NEWMODS:=$(foreach d,$(MOD_SUBDIRS),$(notdir $(wildcard $(d)/*.so)))
OLDMODS=$(filter-out $(NEWMODS),$(notdir $(wildcard $(DESTDIR)$(MODULES_DIR)/*.so))) OLDMODS=$(filter-out $(NEWMODS),$(notdir $(wildcard $(DESTDIR)$(MODULES_DIR)/*.so)))
@@ -805,7 +805,7 @@ cleantest:
@cmp -s .cleancount .lastclean || $(MAKE) clean @cmp -s .cleancount .lastclean || $(MAKE) clean
$(SUBDIRS_UNINSTALL): $(SUBDIRS_UNINSTALL):
@$(SUBMAKE) -C $(@:-uninstall=) uninstall +@$(SUBMAKE) -C $(@:-uninstall=) uninstall
_uninstall: $(SUBDIRS_UNINSTALL) _uninstall: $(SUBDIRS_UNINSTALL)
rm -f $(DESTDIR)$(MODULES_DIR)/* rm -f $(DESTDIR)$(MODULES_DIR)/*