diff options
| author | Russell Bryant <russell@russellbryant.com> | 2007-05-24 19:06:38 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2007-05-24 19:06:38 +0000 |
| commit | ccd22dc9e2651c05a19544e6ed50aece5b766318 (patch) | |
| tree | 8c762f26c6b7a213ff8d7e00c5ab1829047a0b28 /Makefile | |
| parent | 287bcc61271696ece293524a5fd097921fad2805 (diff) | |
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)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65982 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -687,10 +687,10 @@ gmenuselect: menuselect/gmenuselect menuselect-tree -@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 ..." |