kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

buildsystem: Don't force main to depend on everything else.

Browse Source 
Directory 'main' only needs to depend on embedded modules. If no
module embedding is selected, the dependency is dropped.

Review: https://reviewboard.asterisk.org/r/3212/
........

Merged revisions 408083 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 408084 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 408085 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@408086 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Walter Doekes
2014-02-14 13:31:48 +00:00
parent f001981862
commit 3a55eb88d2
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@@ -101,6 +101,8 @@ export LDCONFIG_FLAGS
export PYTHON export PYTHON
-include makeopts -include makeopts
# we want the MENUSELECT_EMBED var
-include menuselect.makeopts
# start the primary CFLAGS and LDFLAGS with any that were provided # start the primary CFLAGS and LDFLAGS with any that were provided
# to the configure script # to the configure script
@@ -359,12 +361,16 @@ makeopts.embed_rules: menuselect.makeopts
$(SUBDIRS): makeopts .lastclean main/version.c include/asterisk/build.h include/asterisk/buildopts.h defaults.h makeopts.embed_rules $(SUBDIRS): makeopts .lastclean main/version.c include/asterisk/build.h include/asterisk/buildopts.h defaults.h makeopts.embed_rules
ifeq ($(findstring $(OSARCH), mingw32 cygwin ),) ifeq ($(findstring $(OSARCH), mingw32 cygwin ),)
ifneq ($(MENUSELECT_EMBED),)
# Non-windows: # Non-windows:
# ensure that all module subdirectories are processed before 'main' during # ensure that all module subdirectories are processed before 'main' during
# a parallel build, since if there are modules selected to be embedded the # a parallel build, since if there are modules selected to be embedded the
# directories containing them must be completed before the main Asterisk # directories containing them must be completed before the main Asterisk
# binary can be built # binary can be built.
# If MENUSELECT_EMBED is empty, we don't need this and allow 'main' to be
# be built without building all dependencies first.
main: $(filter-out main,$(MOD_SUBDIRS)) main: $(filter-out main,$(MOD_SUBDIRS))
endif
else else
# Windows: we need to build main (i.e. the asterisk dll) first, # Windows: we need to build main (i.e. the asterisk dll) first,
# followed by res, followed by the other directories, because # followed by res, followed by the other directories, because