[asterisk-commits] trunk r32407 - in /trunk: apps/ build_tools/
cdr/ channels/ codecs/ formats/ ...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Mon Jun 5 13:46:27 MST 2006
Author: kpfleming
Date: Mon Jun 5 15:46:27 2006
New Revision: 32407
URL: http://svn.digium.com/view/asterisk?rev=32407&view=rev
Log:
use module names, not file names, in menuselect
work around XML parsing bug in menuselect for default sounds package
Modified:
trunk/apps/Makefile
trunk/build_tools/prep_moduledeps
trunk/build_tools/sounds.xml
trunk/cdr/Makefile
trunk/channels/Makefile
trunk/codecs/Makefile
trunk/codecs/codec_g723_1.c
trunk/formats/Makefile
trunk/funcs/Makefile
trunk/pbx/Makefile
trunk/res/Makefile
trunk/res/res_snmp.c
trunk/utils/Makefile
Modified: trunk/apps/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/apps/Makefile?rev=32407&r1=32406&r2=32407&view=diff
==============================================================================
--- trunk/apps/Makefile (original)
+++ trunk/apps/Makefile Mon Jun 5 15:46:27 2006
@@ -11,7 +11,7 @@
# the GNU General Public License
#
-MODS:=$(filter-out $(MENUSELECT_APPS),$(patsubst %.c,%.so,$(wildcard app_*.c)))
+SELECTED_MODS:=$(filter-out $(MENUSELECT_APPS),$(patsubst %.c,%,$(wildcard app_*.c)))
# If you have UnixODBC you can use ODBC voicemail
# storage
@@ -21,6 +21,8 @@
# Uncomment for extended ODBC voicemail storage
#CFLAGS+=-DEXTENDED_ODBC_STORAGE
# See doc/README.odbcstorage for more information
+
+MODS:=$(patsubst %,%.so,$(SELECTED_MODS))
all: $(MODS)
Modified: trunk/build_tools/prep_moduledeps
URL: http://svn.digium.com/view/asterisk/trunk/build_tools/prep_moduledeps?rev=32407&r1=32406&r2=32407&view=diff
==============================================================================
--- trunk/build_tools/prep_moduledeps (original)
+++ trunk/build_tools/prep_moduledeps Mon Jun 5 15:46:27 2006
@@ -38,7 +38,7 @@
fname=${file##${dir}/}
get_description ${file}
desc=${TDESC}
- echo -e "\t\t<member name=\"${fname%%.c}.so\" displayname=\"${desc}\">"
+ echo -e "\t\t<member name=\"${fname%%.c}\" displayname=\"${desc}\">"
awk -f build_tools/get_moduledeps ${file}
echo -e "\t\t</member>"
done
Modified: trunk/build_tools/sounds.xml
URL: http://svn.digium.com/view/asterisk/trunk/build_tools/sounds.xml?rev=32407&r1=32406&r2=32407&view=diff
==============================================================================
--- trunk/build_tools/sounds.xml (original)
+++ trunk/build_tools/sounds.xml Mon Jun 5 15:46:27 2006
@@ -1,19 +1,33 @@
<category name="MENUSELECT_SOUNDS" displayname="Sound Packages" positive_output="yes">
- <member name="CORE_SOUNDS_EN_WAV" displayname="Core Sounds - English, WAV format" />
- <member name="CORE_SOUNDS_EN_ULAW" displayname="Core Sounds - English, mu-Law format" />
- <member name="CORE_SOUNDS_EN_ALAW" displayname="Core Sounds - English, a-Law format" />
+ <member name="CORE_SOUNDS_EN_WAV" displayname="Core Sounds - English, WAV format">
+ </member>
+ <member name="CORE_SOUNDS_EN_ULAW" displayname="Core Sounds - English, mu-Law format">
+ </member>
+ <member name="CORE_SOUNDS_EN_ALAW" displayname="Core Sounds - English, a-Law format">
+ </member>
<member name="CORE_SOUNDS_EN_GSM" displayname="Core Sounds - English, GSM format" >
<defaultenabled>yes</defaultenabled>
</member>
- <member name="CORE_SOUNDS_EN_G729" displayname="Core Sounds - English, G.729 format" />
- <member name="CORE_SOUNDS_ES_WAV" displayname="Core Sounds - Spanish, WAV format" />
- <member name="CORE_SOUNDS_ES_ULAW" displayname="Core Sounds - Spanish, mu-Law format" />
- <member name="CORE_SOUNDS_ES_ALAW" displayname="Core Sounds - Spanish, a-Law format" />
- <member name="CORE_SOUNDS_ES_GSM" displayname="Core Sounds - Spanish, GSM format" />
- <member name="CORE_SOUNDS_ES_G729" displayname="Core Sounds - Spanish, G.729 format" />
- <member name="CORE_SOUNDS_FR_WAV" displayname="Core Sounds - French, WAV format" />
- <member name="CORE_SOUNDS_FR_ULAW" displayname="Core Sounds - French, mu-Law format" />
- <member name="CORE_SOUNDS_FR_ALAW" displayname="Core Sounds - French, a-Law format" />
- <member name="CORE_SOUNDS_FR_GSM" displayname="Core Sounds - French, GSM format" />
- <member name="CORE_SOUNDS_FR_G729" displayname="Core Sounds - French, G.729 format" />
+ <member name="CORE_SOUNDS_EN_G729" displayname="Core Sounds - English, G.729 format">
+ </member>
+ <member name="CORE_SOUNDS_ES_WAV" displayname="Core Sounds - Spanish, WAV format">
+ </member>
+ <member name="CORE_SOUNDS_ES_ULAW" displayname="Core Sounds - Spanish, mu-Law format">
+ </member>
+ <member name="CORE_SOUNDS_ES_ALAW" displayname="Core Sounds - Spanish, a-Law format">
+ </member>
+ <member name="CORE_SOUNDS_ES_GSM" displayname="Core Sounds - Spanish, GSM format">
+ </member>
+ <member name="CORE_SOUNDS_ES_G729" displayname="Core Sounds - Spanish, G.729 format">
+ </member>
+ <member name="CORE_SOUNDS_FR_WAV" displayname="Core Sounds - French, WAV format">
+ </member>
+ <member name="CORE_SOUNDS_FR_ULAW" displayname="Core Sounds - French, mu-Law format">
+ </member>
+ <member name="CORE_SOUNDS_FR_ALAW" displayname="Core Sounds - French, a-Law format">
+ </member>
+ <member name="CORE_SOUNDS_FR_GSM" displayname="Core Sounds - French, GSM format">
+ </member>
+ <member name="CORE_SOUNDS_FR_G729" displayname="Core Sounds - French, G.729 format">
+ </member>
</category>
Modified: trunk/cdr/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/cdr/Makefile?rev=32407&r1=32406&r2=32407&view=diff
==============================================================================
--- trunk/cdr/Makefile (original)
+++ trunk/cdr/Makefile Mon Jun 5 15:46:27 2006
@@ -11,7 +11,7 @@
# the GNU General Public License
#
-MODS:=$(filter-out $(MENUSELECT_CDR),$(patsubst %.c,%.so,$(wildcard cdr_*.c)))
+SELECTED_MODS:=$(filter-out $(MENUSELECT_CDR),$(patsubst %.c,%,$(wildcard cdr_*.c)))
#The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
#This works for even old (2.96) versions of gcc and provides a small boost either way.
@@ -34,6 +34,8 @@
endif
endif
endif
+
+MODS:=$(patsubst %,%.so,$(SELECTED_MODS))
all: depend $(MODS)
Modified: trunk/channels/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/channels/Makefile?rev=32407&r1=32406&r2=32407&view=diff
==============================================================================
--- trunk/channels/Makefile (original)
+++ trunk/channels/Makefile Mon Jun 5 15:46:27 2006
@@ -11,7 +11,7 @@
# the GNU General Public License
#
-MODS:=$(filter-out $(MENUSELECT_CHANNELS),$(patsubst %.c,%.so,$(wildcard chan_*.c)))
+SELECTED_MODS:=$(filter-out $(MENUSELECT_CHANNELS),$(patsubst %.c,%,$(wildcard chan_*.c)))
ifeq ($(OSARCH),OpenBSD)
PTLIB=-lpt_OpenBSD_x86_r
@@ -45,11 +45,11 @@
endif
ifeq ($(wildcard h323/libchanh323.a),)
- MODS:=$(filter-out chan_h323.so,$(MODS))
+ SELECTED_MODS:=$(filter-out chan_h323,$(SELECTED_MODS))
endif
ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/mISDNuser/mISDNlib.h),)
- MODS:=$(filter-out chan_misdn.so,$(MODS))
+ SELECTED_MODS:=$(filter-out chan_misdn,$(SELECTED_MODS))
else
CFLAGS+=-Imisdn
endif
@@ -61,6 +61,8 @@
ifndef PWLIBDIR
PWLIBDIR=$(HOME)/pwlib
endif
+
+MODS:=$(patsubst %,%.so,$(SELECTED_MODS))
all: depend $(MODS)
Modified: trunk/codecs/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/codecs/Makefile?rev=32407&r1=32406&r2=32407&view=diff
==============================================================================
--- trunk/codecs/Makefile (original)
+++ trunk/codecs/Makefile Mon Jun 5 15:46:27 2006
@@ -11,26 +11,17 @@
# the GNU General Public License
#
-MODS:=$(filter-out $(MENUSELECT_CODECS),$(patsubst %.c,%.so,$(wildcard codec_*.c)))
-
-ifeq ($(wildcard g723.1/coder.c),)
- MODS:=$(filter-out codec_g723_1.so,$(MODS))
-else
- LIBG723=g723.1/libg723.a
-endif
-
-ifneq ($(wildcard g723.1b/coder2.c),)
- MODS+=codec_g723_1b.so
- LIBG723B=g723.1b/libg723b.a
-endif
+SELECTED_MODS:=$(filter-out $(MENUSELECT_CODECS),$(patsubst %.c,%,$(wildcard codec_*.c)))
ifeq ($(wildcard ilbc/iLBC_decode.h),)
- MODS:=$(filter-out codec_ilbc.so,$(MODS))
+ MODS:=$(filter-out codec_ilbc,$(MODS))
else
LIBILBC=ilbc/libilbc.a
endif
LIBLPC10=lpc10/liblpc10.a
+
+MODS:=$(patsubst %,%.so,$(SELECTED_MODS))
all: depend $(MODS)
Modified: trunk/codecs/codec_g723_1.c
URL: http://svn.digium.com/view/asterisk/trunk/codecs/codec_g723_1.c?rev=32407&r1=32406&r2=32407&view=diff
==============================================================================
--- trunk/codecs/codec_g723_1.c (original)
+++ trunk/codecs/codec_g723_1.c Mon Jun 5 15:46:27 2006
@@ -26,6 +26,10 @@
*
* \ingroup codecs
*/
+
+/*** MODULEINFO
+ <defaultenabled>no</defaultenabled>
+ ***/
#define TYPE_HIGH 0x0
#define TYPE_LOW 0x1
Modified: trunk/formats/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/formats/Makefile?rev=32407&r1=32406&r2=32407&view=diff
==============================================================================
--- trunk/formats/Makefile (original)
+++ trunk/formats/Makefile Mon Jun 5 15:46:27 2006
@@ -11,9 +11,11 @@
# the GNU General Public License
#
-MODS:=$(filter-out $(MENUSELECT_FORMATS),$(patsubst %.c,%.so,$(wildcard format_*.c)))
+SELECTED_MODS:=$(filter-out $(MENUSELECT_FORMATS),$(patsubst %.c,%,$(wildcard format_*.c)))
GSMLIB=../codecs/gsm/lib/libgsm.a
+
+MODS:=$(patsubst %,%.so,$(SELECTED_MODS))
all: depend $(MODS)
Modified: trunk/funcs/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/funcs/Makefile?rev=32407&r1=32406&r2=32407&view=diff
==============================================================================
--- trunk/funcs/Makefile (original)
+++ trunk/funcs/Makefile Mon Jun 5 15:46:27 2006
@@ -11,18 +11,20 @@
# the GNU General Public License
#
-MODS:=$(filter-out $(MENUSELECT_FUNCS),$(patsubst %.c,%.so,$(wildcard func_*.c)))
+SELECTED_MODS:=$(filter-out $(MENUSELECT_FUNCS),$(patsubst %.c,%,$(wildcard func_*.c)))
# TODO This check needs to be handled with autoconf
ifeq ($(OSARCH),SunOS)
ifeq ($(shell if [ 0x`$(CROSS_COMPILE_BIN)curl-config --vernum` -ge 0x70907 ]; then echo "OK" ; fi),)
- MODS:=$(filter-out func_curl.so,$(MODS))
+ MODS:=$(filter-out func_curl,$(MODS))
endif
else
ifeq ($(shell if [[ 0x`$(CROSS_COMPILE_BIN)curl-config --vernum` -ge 0x70907 ]]; then echo "OK" ; fi),)
- MODS:=$(filter-out func_curl.so,$(MODS))
+ MODS:=$(filter-out func_curl,$(MODS))
endif
endif
+
+MODS:=$(patsubst %,%.so,$(SELECTED_MODS))
all: $(MODS)
Modified: trunk/pbx/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/pbx/Makefile?rev=32407&r1=32406&r2=32407&view=diff
==============================================================================
--- trunk/pbx/Makefile (original)
+++ trunk/pbx/Makefile Mon Jun 5 15:46:27 2006
@@ -11,13 +11,15 @@
# the GNU General Public License
#
-MODS:=$(filter-out $(MENUSELECT_PBX),$(patsubst %.c,%.so,$(wildcard pbx_*.c)))
+SELECTED_MODS:=$(filter-out $(MENUSELECT_PBX),$(patsubst %.c,%,$(wildcard pbx_*.c)))
MOC=$(QTDIR)/bin/moc
KDE_FLAGS=-I$(KDEDIR)/include -I$(KDEDIR)/include/kde -I$(QTDIR)/include
KDE_LIBS=-L$(KDEDIR)/lib -L$(QTDIR)/lib -lqt -lkdecore -lkdeui
KDE_CONSOLE_OBJS=pbx_kdeconsole_main.o pbx_kdeconsole.o
+
+MODS:=$(patsubst %,%.so,$(SELECTED_MODS))
all: depend $(MODS)
Modified: trunk/res/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/res/Makefile?rev=32407&r1=32406&r2=32407&view=diff
==============================================================================
--- trunk/res/Makefile (original)
+++ trunk/res/Makefile Mon Jun 5 15:46:27 2006
@@ -11,28 +11,30 @@
# the GNU General Public License
#
-MODS:=$(filter-out $(MENUSELECT_RES),$(patsubst %.c,%.so,$(wildcard res_*.c)))
+SELECTED_MODS:=$(filter-out $(MENUSELECT_RES),$(patsubst %.c,%,$(wildcard res_*.c)))
ifeq ($(OSARCH),FreeBSD)
- MODS:=$(filter-out $(shell if test ${BSDVERSION} -lt 500000 ; then echo "res_config_odbc.so"; fi),$(MODS))
+ SELECTED_MODS:=$(filter-out $(shell if test ${BSDVERSION} -lt 500000 ; then echo "res_config_odbc"; fi),$(SELECTED_MODS))
endif
# NETsnmp has some difficulties on some platforms (conflict with unload_module)
# Until we figure out if the collission is version-specific or what to do
# we have disabled res_snmp on OS/X and *BSD
ifeq ($(OSARCH),Darwin)
- MODS:=$(filter-out res_snmp.so,$(MODS))
+ SELECTED_MODS:=$(filter-out res_snmp,$(SELECTED_MODS))
else
ifeq ($(findstring BSD,$(OSARCH)),BSD)
- MODS:=$(filter-out res_snmp.so,$(MODS))
+ SELECTED_MODS:=$(filter-out res_snmp,$(SELECTED_MODS))
endif
endif
ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/net-snmp/net-snmp-config.h),)
- MODS:=$(filter-out res_snmp.so,$(MODS))
+ SELECTED_MODS:=$(filter-out res_snmp,$(SELECTED_MODS))
else
SNMP_LDLIBS+=$(shell net-snmp-config --agent-libs)
endif
+
+MODS:=$(patsubst %,%.so,$(SELECTED_MODS))
all: depend $(MODS)
Modified: trunk/res/res_snmp.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_snmp.c?rev=32407&r1=32406&r2=32407&view=diff
==============================================================================
--- trunk/res/res_snmp.c (original)
+++ trunk/res/res_snmp.c Mon Jun 5 15:46:27 2006
@@ -141,13 +141,3 @@
{
return MODULE_DESCRIPTION;
}
-
-/*
- * Local Variables:
- * c-file-style: gnu
- * c-basic-offset: 4
- * c-file-offsets: ((case-label . 0))
- * tab-width: 4
- * indent-tabs-mode: t
- * End:
- */
Modified: trunk/utils/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/utils/Makefile?rev=32407&r1=32406&r2=32407&view=diff
==============================================================================
--- trunk/utils/Makefile (original)
+++ trunk/utils/Makefile Mon Jun 5 15:46:27 2006
@@ -26,7 +26,7 @@
UTILS:=$(filter-out astman,$(UTILS))
endif
-ifneq ($(filter pbx_ael.so,$(MENUSELECT_PBX)),)
+ifneq ($(filter pbx_ael,$(MENUSELECT_PBX)),)
UTILS:=$(filter-out aelparse,$(UTILS))
endif
More information about the asterisk-commits
mailing list