aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-03-19 19:00:11 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-03-19 19:00:11 +0000
commitfde6200f58d072d41f8c18eb265019ee4b8fce91 (patch)
tree234be694d7642ab04ea8479ce2875d7aac224572 /Makefile
parentb898e95a0c6f2149a70ce73e80d3bb231f8ba77b (diff)
Merged revisions 109974 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r109974 | qwell | 2008-03-19 12:15:14 -0500 (Wed, 19 Mar 2008) | 13 lines 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/branches/1.6.0@110031 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 510863ecc..437fab471 100644
--- a/Makefile
+++ b/Makefile
@@ -831,7 +831,7 @@ menuselect/gmenuselect: 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 >> $@
@@ -839,6 +839,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>" >> $@