diff options
author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-19 17:15:14 +0000 |
---|---|---|
committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-19 17:15:14 +0000 |
commit | 425f17c8b222e10afd6dea147006312775dbf487 (patch) | |
tree | ba4afb85e3854abcbde13f646d2dd69d5cf2283b /Makefile | |
parent | ab44bf670074a2c0dbe9595c0162ed872434d227 (diff) |
Merged revisions 109973 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r109973 | qwell | 2008-03-19 12:12:52 -0500 (Wed, 19 Mar 2008) | 5 lines
People report bugs about Asterisk crashing with DO_CRASH enabled was getting a little silly...
Now we only show certain cflags when you run configure with --enable-dev-mode
(corresponding menuselect change to follow)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@109974 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -847,7 +847,7 @@ menuselect/nmenuselect: menuselect/makeopts menuselect/makeopts: $(MAKE_MENUSELECT) makeopts -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 configure +menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml build_tools/cflags-devmode.xml sounds/sounds.xml build_tools/embed_modules.xml configure @echo "Generating input for menuselect ..." @echo "<?xml version=\"1.0\"?>" > $@ @echo >> $@ @@ -855,6 +855,9 @@ menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(di @for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SUBMAKE) -C $${dir} SUBDIR=$${dir} moduleinfo >> $@; done @for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SUBMAKE) -C $${dir} SUBDIR=$${dir} makeopts >> $@; done @cat build_tools/cflags.xml >> $@ + @if [ "${AST_DEVMODE}" = "yes" ]; then \ + cat build_tools/cflags-devmode.xml >> $@; \ + fi @cat build_tools/embed_modules.xml >> $@ @cat sounds/sounds.xml >> $@ @echo "</menu>" >> $@ |