People report bugs about Asterisk crashing with DO_CRASH enabled was getting a little...

Now we only show certain cflags when you run configure with --enable-dev-mode
(corresponding menuselect change to follow)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@109973 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/Makefile b/Makefile
index 68c0e9828e7b8bfd24456dc4179b157865042ece..3d14bfdb40efb0dd9fdb4154ebffca5d013719f5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -756,7 +756,7 @@ menuselect/menuselect: makeopts menuselect/menuselect.c menuselect/menuselect_cu
 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="" 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 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 >> $@
@@ -764,6 +764,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>" >> $@

diff --git a/build_tools/cflags-devmode.xml b/build_tools/cflags-devmode.xml
new file mode 100644 (file)
index 0000000..8be92e7
--- /dev/null
+++ b/build_tools/cflags-devmode.xml
@@ -0,0 +1,17 @@
+       <category name="MENUSELECT_CFLAGS" displayname="Compiler Flags - Development">
+               <member name="DEBUG_SCHEDULER" displayname="Enable Scheduler Debugging Output">
+               </member>
+               <member name="DEBUG_THREADLOCALS" displayname="Enable Thread-Local-Storage Debugging">
+               </member>
+               <member name="DETECT_DEADLOCKS" displayname="Detect Deadlocks">
+                       <depend>DEBUG_THREADS</depend>
+               </member>
+               <member name="DO_CRASH" displayname="Crash on fatal errors">
+               </member>
+               <member name="DUMP_SCHEDULER" displayname="Dump Scheduler Contents for Debugging">
+               </member>
+               <member name="MTX_PROFILE" displayname="Enable Code Profiling Using TSC Counters">
+               </member>
+               <member name="TRACE_FRAMES" displayname="Trace Frame Allocations">
+               </member>
+       </category>

diff --git a/build_tools/cflags.xml b/build_tools/cflags.xml
index ccbabd035a5e11d923571a0599b65ea1d8d1f62b..db140d6aae9b2efbd0e32a4d851348d8d98433cc 100644 (file)
--- a/build_tools/cflags.xml
+++ b/build_tools/cflags.xml
@@ -1,31 +1,16 @@
        <category name="MENUSELECT_CFLAGS" displayname="Compiler Flags" positive_output="yes" remove_on_change=".lastclean">
-               <member name="DEBUG_CHANNEL_LOCKS" displayname="Debug Channel Locking">
+               <member name="DONT_OPTIMIZE" displayname="Disable Optimizations by the Compiler">
                </member>
-               <member name="DEBUG_SCHEDULER" displayname="Enable Scheduler Debugging Output">
+               <member name="DEBUG_CHANNEL_LOCKS" displayname="Debug Channel Locking">
                </member>
                <member name="DEBUG_THREADS" displayname="Enable Thread Debugging">
                </member>
-               <member name="DEBUG_THREADLOCALS" displayname="Enable Thread-Local-Storage Debugging">
-               </member>
-               <member name="DETECT_DEADLOCKS" displayname="Detect Deadlocks">
-                       <depend>DEBUG_THREADS</depend>
-               </member>
-               <member name="DO_CRASH" displayname="Crash on fatal errors">
-               </member>
-               <member name="DONT_OPTIMIZE" displayname="Disable Optimizations by the Compiler">
-               </member>
-               <member name="DUMP_SCHEDULER" displayname="Dump Scheduler Contents for Debugging">
-               </member>
                <member name="LOW_MEMORY" displayname="Optimize for Low Memory Usage">
                </member>
                <member name="MALLOC_DEBUG" displayname="Keep Track of Memory Allocations">
                </member>
-               <member name="MTX_PROFILE" displayname="Enable Code Profiling Using TSC Counters">
-               </member>
                <member name="RADIO_RELAX" displayname="Relax DTMF for Radio Applications">
                </member>
-               <member name="TRACE_FRAMES" displayname="Trace Frame Allocations">
-               </member>
                <member name="STATIC_BUILD" displayname="Build static binaries">
                </member>
                <member name="LOADABLE_MODULES" displayname="Runtime module loading">