[svn-commits] tilghman: branch 1.6.0 r934 - in /branches/1.6.0: ./ Makefile.rules

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed May 27 16:53:18 2009
New Revision: 934

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

................
  r933 | tilghman | 2009-05-27 16:52:25 -0500 (Wed, 27 May 2009) | 9 lines
  
  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:
    branches/1.6.0/   (props changed)
    branches/1.6.0/Makefile.rules

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
--- trunk-merged (original)
+++ trunk-merged Wed May 27 16:53:18 2009
@@ -1,1 +1,1 @@
-/trunk:540-559,575,579,583,586,588,590,592,594,603,607,612,615,617,627,647,653,659,662,707,715,719,725-726,730,887
+/trunk:540-559,575,579,583,586,588,590,592,594,603,607,612,615,617,627,647,653,659,662,707,715,719,725-726,730,887,933

Modified: branches/1.6.0/Makefile.rules
URL: http://svn.asterisk.org/svn-view/asterisk-addons/branches/1.6.0/Makefile.rules?view=diff&rev=934&r1=933&r2=934
==============================================================================
--- branches/1.6.0/Makefile.rules (original)
+++ branches/1.6.0/Makefile.rules Wed May 27 16:53:18 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