kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 20:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move WITH_SMDI from the Makefiles to be handled by menuselect. It will now be

Browse Source 
defined in buildopts.h. Also, remove a few more stray spaces in the gcc commands. 


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@27130 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2006-05-13 10:54:40 +00:00
parent cec3a958e4
commit a3ed43f0dc
4 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@@ -59,9 +59,6 @@ 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 DEBUG=-g3
# Asterisk SMDI integration
WITH_SMDI=1
# Staging directory # Staging directory
# Files are copied here temporarily during the install process # Files are copied here temporarily during the install process
# For example, make DESTDIR=/tmp/asterisk woud put things in # For example, make DESTDIR=/tmp/asterisk woud put things in
@@ -365,7 +362,7 @@ ifeq ($(OSARCH),SunOS)
endif endif
ifeq ($(MAKETOPLEVEL),$(MAKELEVEL)) ifeq ($(MAKETOPLEVEL),$(MAKELEVEL))
CFLAGS+=$(TOPDIR_CFLAGS) $(ASTCFLAGS) CFLAGS+=$(TOPDIR_CFLAGS)$(ASTCFLAGS)
endif endif
# This is used when generating the doxygen documentation # This is used when generating the doxygen documentation
@@ -487,7 +484,7 @@ include/asterisk/buildopts.h: menuselect.makeopts
@rm -f $@.tmp @rm -f $@.tmp
stdtime/libtime.a: stdtime/libtime.a:
CFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" $(MAKE) -C stdtime libtime.a CFLAGS="$(MOD_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C stdtime libtime.a
asterisk: include/asterisk/buildopts.h editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS) asterisk: include/asterisk/buildopts.h editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS)
build_tools/make_build_h > include/asterisk/build.h.tmp build_tools/make_build_h > include/asterisk/build.h.tmp
@@ -502,9 +499,9 @@ muted: muted.o
$(CC) $(AUDIO_LIBS) -o muted muted.o $(CC) $(AUDIO_LIBS) -o muted muted.o
subdirs: subdirs:
@for x in $(MOD_SUBDIRS); do CFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" $(MAKE) -C $$x || exit 1 ; done @for x in $(MOD_SUBDIRS); do CFLAGS="$(MOD_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C $$x || exit 1 ; done
@CFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" $(MAKE) -C utils @CFLAGS="$(OTHER_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C utils
@CFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" $(MAKE) -C agi @CFLAGS="$(OTHER_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C agi
clean-depend: clean-depend:
@for x in $(SUBDIRS); do $(MAKE) -C $$x clean-depend || exit 1 ; done @for x in $(SUBDIRS); do $(MAKE) -C $$x clean-depend || exit 1 ; done

4
apps/Makefile
View File

@@ -13,10 +13,6 @@
MODS:=$(filter-out $(MENUSELECT_APPS),$(patsubst %.c,%.so,$(wildcard app_*.c))) MODS:=$(filter-out $(MENUSELECT_APPS),$(patsubst %.c,%.so,$(wildcard app_*.c)))
ifneq ($(WITH_SMDI),)
CFLAGS+=-DWITH_SMDI
endif
# If you have UnixODBC you can use ODBC voicemail # If you have UnixODBC you can use ODBC voicemail
# storage # storage
# #

5
build_tools/cflags.xml
View File

@@ -11,10 +11,13 @@
</member> </member>
<member name="MALLOC_DEBUG" displayname="Keep Track of Memory Allocations"> <member name="MALLOC_DEBUG" displayname="Keep Track of Memory Allocations">
</member> </member>
<member name="MTX_PROFILE" displayname="Enable Code Profiling Using TSC Counters">
</member>
<member name="RADIO_RELAX" displayname="Relax DTMF for Radio Applications"> <member name="RADIO_RELAX" displayname="Relax DTMF for Radio Applications">
</member> </member>
<member name="TRACE_FRAMES" displayname="Trace Frame Allocations"> <member name="TRACE_FRAMES" displayname="Trace Frame Allocations">
</member> </member>
<member name="MTX_PROFILE" displayname="Enable Code Profiling Using TSC Counters"> <member name="WITH_SMDI" displayname="Include SMDI Support">
<defaultenabled>yes</defaultenabled>
</member> </member>
</category> </category>

4
channels/Makefile
View File

@@ -44,10 +44,6 @@ ifeq ($(OSARCH),SunOS)
SOLINK+=-lrt SOLINK+=-lrt
endif endif
ifeq ($(WITH_SMDI),1)
CFLAGS+=-DWITH_SMDI
endif
ifeq ($(wildcard h323/libchanh323.a),) ifeq ($(wildcard h323/libchanh323.a),)
MODS:=$(filter-out chan_h323.so,$(MODS)) MODS:=$(filter-out chan_h323.so,$(MODS))
endif endif