various minor cleanups

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@26877 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2006-05-11 13:15:10 +00:00
parent 74cd80b1a4
commit 76347c8d31

View File

@@ -69,7 +69,7 @@ endif
OVERWRITE=y OVERWRITE=y
# Include debug and macro symbols in the executables (-g) and profiling info (-pg) # Include debug and macro symbols in the executables (-g) and profiling info (-pg)
DEBUG=-g3 #-pg DEBUG=-g3
# Set NOCRYPTO to yes if you do not want to have crypto support or dependencies # Set NOCRYPTO to yes if you do not want to have crypto support or dependencies
#NOCRYPTO=yes #NOCRYPTO=yes
@@ -87,16 +87,6 @@ DEBUG=-g3 #-pg
# Asterisk SMDI integration # Asterisk SMDI integration
WITH_SMDI=1 WITH_SMDI=1
# Optional debugging parameters
DEBUG_THREADS = #-DDUMP_SCHEDULER #-DDEBUG_SCHEDULER #-DDEBUG_THREADS #-DDO_CRASH #-DDETECT_DEADLOCKS
# If you want to debug channel locking, try this (depends on code using
# ast_channel_lock and companions to work)
DEBUG_THREADS += #-DDEBUG_CHANNEL_LOCKS
# Uncomment next one to enable ast_frame tracing (for debugging)
TRACE_FRAMES = #-DTRACE_FRAMES
# Where to install asterisk after compiling # Where to install asterisk after compiling
# Default -> leave empty # Default -> leave empty
INSTALL_PREFIX?= INSTALL_PREFIX?=
@@ -110,16 +100,16 @@ DESTDIR?=
#DESTDIR?=/tmp/asterisk #DESTDIR?=/tmp/asterisk
# Original busydetect routine # Original busydetect routine
BUSYDETECT = #-DBUSYDETECT #BUSYDETECT = -DBUSYDETECT
# Improved busydetect routine, comment the previous one if you use this one # Improved busydetect routine, comment the previous one if you use this one
BUSYDETECT+= #-DBUSYDETECT_MARTIN #BUSYDETECT+= -DBUSYDETECT_MARTIN
# Detect the busy signal looking only at tone lengths # Detect the busy signal looking only at tone lengths
# For example if you have 3 beeps 100ms tone, 100ms silence separated by 500 ms of silence # For example if you have 3 beeps 100ms tone, 100ms silence separated by 500 ms of silence
BUSYDETECT+= #-DBUSYDETECT_TONEONLY #BUSYDETECT+= -DBUSYDETECT_TONEONLY
# Enforce the detection of busy signal (get rid of false hangups) # Enforce the detection of busy signal (get rid of false hangups)
# Don't use together with -DBUSYDETECT_TONEONLY # Don't use together with -DBUSYDETECT_TONEONLY
BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE #BUSYDETECT+= -DBUSYDETECT_COMPARE_TONE_AND_SILENCE
# Define standard directories for various platforms # Define standard directories for various platforms
# These apply if they are not redefined in asterisk.conf # These apply if they are not redefined in asterisk.conf
@@ -251,7 +241,7 @@ ifeq ($(OSARCH),SunOS)
ID=/usr/xpg4/bin/id ID=/usr/xpg4/bin/id
endif endif
ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) #-DMAKE_VALGRIND_HAPPY ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE)
ASTCFLAGS+=$(OPTIMIZE) ASTCFLAGS+=$(OPTIMIZE)
ifeq ($(AST_DEVMODE),yes) ifeq ($(AST_DEVMODE),yes)
@@ -322,11 +312,7 @@ else
endif endif
endif endif
ASTCFLAGS+= $(DEBUG_THREADS) ASTCFLAGS+=$(MALLOC_DEBUG)$(BUSYDETECT)$(OPTIONS)
ASTCFLAGS+= $(TRACE_FRAMES)
ASTCFLAGS+= $(MALLOC_DEBUG)
ASTCFLAGS+= $(BUSYDETECT)
ASTCFLAGS+= $(OPTIONS)
ifeq ($(findstring dont-optimize,$(MAKECMDGOALS)),) ifeq ($(findstring dont-optimize,$(MAKECMDGOALS)),)
ASTCFLAGS+=-fomit-frame-pointer ASTCFLAGS+=-fomit-frame-pointer
endif endif