fix the case where menuselect.makeopts is getting generated in the same run of
authorRussell Bryant <russell@russellbryant.com>
Wed, 28 Jun 2006 15:10:57 +0000 (15:10 +0000)
committerRussell Bryant <russell@russellbryant.com>
Wed, 28 Jun 2006 15:10:57 +0000 (15:10 +0000)
"make" as the current build and some of the MENUELSELECT_CFLAGS are set in the
user or global level asterisk.makeopts file

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36192 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Makefile

index b66bf0b..df7f839 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -132,6 +132,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
 # Uncomment to enable MMXTM optimizations for x86 architecture CPU's