[svn-commits] mjordan: branch 11 r408193 - /branches/11/Makefile

[SVN commits to the Digium repositories]

Author: mjordan
Date: Sat Feb 15 19:47:45 2014
New Revision: 408193

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=408193
Log:
buildsystem: Unbreak the build (infloop) on Asterisk 11+

Apparently r408084 ( https://reviewboard.asterisk.org/r/3212/ ) broke the
build. This patch fixes it by ignoring the .lastclean dependencies if the
MENUSELECT_EMBED variable is not defined.

patches:
  tmp.diff uploaded by wdoekes (License 5674)

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

Modified:
    branches/11/Makefile

Modified: branches/11/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/11/Makefile?view=diff&rev=408193&r1=408192&r2=408193
==============================================================================
--- branches/11/Makefile (original)
+++ branches/11/Makefile Sat Feb 15 19:47:45 2014
@@ -99,8 +99,6 @@
 export PYTHON
 
 -include makeopts
-# we want the MENUSELECT_EMBED var
--include menuselect.makeopts
 
 # start the primary CFLAGS and LDFLAGS with any that were provided
 # to the configure script
@@ -365,7 +363,7 @@
 $(SUBDIRS): makeopts .lastclean main/version.c include/asterisk/build.h include/asterisk/buildopts.h defaults.h makeopts.embed_rules
 
 ifeq ($(findstring $(OSARCH), mingw32 cygwin ),)
-  ifneq ($(MENUSELECT_EMBED),)
+  ifeq ($(shell grep ^MENUSELECT_EMBED=$$ menuselect.makeopts 2>/dev/null),)
     # 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