[svn-commits] tilghman: trunk r933 - in /trunk: ./ Makefile.rules

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed May 27 16:52:25 2009
New Revision: 933

URL: http://svn.asterisk.org/svn-view/asterisk-addons?view=rev&rev=933
Log:
Merged revisions 932 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-addons/branches/1.4

........
  r932 | tilghman | 2009-05-27 16:51:27 -0500 (Wed, 27 May 2009) | 2 lines
  
  DONT_OPTIMIZE is a Makefile directive and needs to be interpreted before the compiler starts.
........

Modified:
    trunk/   (props changed)
    trunk/Makefile.rules

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Wed May 27 16:52:25 2009
@@ -1,1 +1,1 @@
-/branches/1.4:1-299,308,310,317,319,329,342,348,358,380,382,387,389,398,405,410,414,417,423,428,466,472,475,479,485,490,502,539,574,578,606,714,886
+/branches/1.4:1-299,308,310,317,319,329,342,348,358,380,382,387,389,398,405,410,414,417,423,428,466,472,475,479,485,490,502,539,574,578,606,714,886,932

Modified: trunk/Makefile.rules
URL: http://svn.asterisk.org/svn-view/asterisk-addons/trunk/Makefile.rules?view=diff&rev=933&r1=932&r2=933
==============================================================================
--- trunk/Makefile.rules (original)
+++ trunk/Makefile.rules Wed May 27 16:52:25 2009
@@ -31,7 +31,8 @@
     CMD_PREFIX=
 endif
 
-ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)),)
+# Addons needs to scan flags from the header file
+ifeq ($(shell $(GREP) -c DONT_OPTIMIZE ${includedir}/asterisk/buildopts.h),0)
     # More GSM codec optimization
     # Uncomment to enable MMXTM optimizations for x86 architecture CPU's
     # which support MMX instructions.  This should be newer pentiums,
@@ -40,6 +41,8 @@
 
     OPTIMIZE?=-O6
     ASTCFLAGS+=$(OPTIMIZE)
+else
+ASTCFLAGS+=-DDONT_OPTIMIZE
 endif
 
 # build rules for various targets