[svn-commits] trunk r36192 - /trunk/Makefile

[svn-commits at lists.digium.com]

Author: russell
Date: Wed Jun 28 10:10:57 2006
New Revision: 36192

URL: http://svn.digium.com/view/asterisk?rev=36192&view=rev
Log:
fix the case where menuselect.makeopts is getting generated in the same run of
"make" as the current build and some of the MENUELSELECT_CFLAGS are set in the
user or global level asterisk.makeopts file

Modified:
    trunk/Makefile

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?rev=36192&r1=36191&r2=36192&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Wed Jun 28 10:10:57 2006
@@ -131,6 +131,10 @@
 TOPDIR_CFLAGS=-Iinclude
 MOD_SUBDIR_CFLAGS=-I../include -I..
 OTHER_SUBDIR_CFLAGS=-I../include -I..
+
+ifeq ($(origin MENUSELECT_CFLAGS),undefined)
+  MENUSELECT_CFLAGS:=$(shell echo $(or $(shell grep MENUSELECT_CFLAGS $(USER_MAKEOPTS) .),$(shell grep MENUSELECT_CFLAGS $(GLOBAL_MAKEOPTS) .)) | cut -f2 -d'=')
+endif
 
 ifeq ($(or $(findstring dont-optimize,$(MAKECMDGOALS)),$(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS))),)
 # More GSM codec optimization