[svn-commits] wdoekes: branch 1.8 r408083 - /branches/1.8/Makefile

[SVN commits to the Digium repositories]

Author: wdoekes
Date: Fri Feb 14 07:25:24 2014
New Revision: 408083

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=408083
Log:
buildsystem: Don't force main to depend on everything else.

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/

Modified:
    branches/1.8/Makefile

Modified: branches/1.8/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/Makefile?view=diff&rev=408083&r1=408082&r2=408083
==============================================================================
--- branches/1.8/Makefile (original)
+++ branches/1.8/Makefile Fri Feb 14 07:25:24 2014
@@ -95,6 +95,9 @@
   include makeopts
 endif
 
+# we want the MENUSELECT_EMBED var
+-include menuselect.makeopts
+
 # start the primary CFLAGS and LDFLAGS with any that were provided
 # to the configure script
 _ASTCFLAGS:=$(CONFIG_CFLAGS)
@@ -327,12 +330,16 @@
 $(SUBDIRS): main/version.c include/asterisk/version.h include/asterisk/build.h include/asterisk/buildopts.h defaults.h makeopts.embed_rules
 
 ifeq ($(findstring $(OSARCH), mingw32 cygwin ),)
+  ifneq ($(MENUSELECT_EMBED),)
     # Non-windows:
     # ensure that all module subdirectories are processed before 'main' during
     # a parallel build, since if there are modules selected to be embedded the
     # 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))
+  endif
 else
     # Windows: we need to build main (i.e. the asterisk dll) first,
     # followed by res, followed by the other directories, because