[asterisk-commits] mjordan: branch 12 r408194 - in /branches/12: ./ Makefile

[SVN commits to the Asterisk project]

Author: mjordan
Date: Sat Feb 15 19:49:05 2014
New Revision: 408194

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=408194
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/
........

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

Modified:
    branches/12/   (props changed)
    branches/12/Makefile

Propchange: branches/12/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: branches/12/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/12/Makefile?view=diff&rev=408194&r1=408193&r2=408194
==============================================================================
--- branches/12/Makefile (original)
+++ branches/12/Makefile Sat Feb 15 19:49:05 2014
@@ -101,8 +101,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
@@ -361,7 +359,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