[svn-commits] russell: trunk r65982 - in /trunk: ./ Makefile

[svn-commits at lists.digium.com]

Author: russell
Date: Thu May 24 14:06:38 2007
New Revision: 65982

URL: http://svn.digium.com/view/asterisk?view=rev&rev=65982
Log:
Merged revisions 65978 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r65978 | russell | 2007-05-24 14:05:08 -0500 (Thu, 24 May 2007) | 3 lines

Clear CFLAGS before running make for menuselect.
(issue #9784, reported by ovi, patch by me)

........

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?view=diff&rev=65982&r1=65981&r2=65982
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Thu May 24 14:06:38 2007
@@ -687,10 +687,10 @@
 	- at menuselect/gmenuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
 
 menuselect/menuselect: makeopts menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h makeopts
-	@CC="$(HOST_CC)" LD="" AR="" RANLIB="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
+	@CC="$(HOST_CC)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
 
 menuselect/gmenuselect: makeopts menuselect/menuselect.c menuselect/menuselect_gtk.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h makeopts
-	@CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" $(MAKE) -C menuselect _gmenuselect CONFIGURE_SILENT="--silent"
+	@CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect _gmenuselect CONFIGURE_SILENT="--silent"
 
 menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml sounds/sounds.xml build_tools/embed_modules.xml
 	@echo "Generating input for menuselect ..."