From: Kevin P. Fleming Date: Mon, 5 Jun 2006 20:46:27 +0000 (+0000) Subject: use module names, not file names, in menuselect X-Git-Tag: 1.4.0-beta1~1044 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e856010714a91f3cf784fb3a951fdbc348e05f32;p=thirdparty%2Fasterisk.git use module names, not file names, in menuselect work around XML parsing bug in menuselect for default sounds package git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@32407 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/apps/Makefile b/apps/Makefile index ed26d855f8..482bf2d3d2 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -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 @@ -22,6 +22,8 @@ MODS:=$(filter-out $(MENUSELECT_APPS),$(patsubst %.c,%.so,$(wildcard app_*.c))) #CFLAGS+=-DEXTENDED_ODBC_STORAGE # See doc/README.odbcstorage for more information +MODS:=$(patsubst %,%.so,$(SELECTED_MODS)) + all: $(MODS) clean-depend: diff --git a/build_tools/prep_moduledeps b/build_tools/prep_moduledeps index a5a27b3743..cc366a2591 100755 --- a/build_tools/prep_moduledeps +++ b/build_tools/prep_moduledeps @@ -38,7 +38,7 @@ process_dir() { fname=${file##${dir}/} get_description ${file} desc=${TDESC} - echo -e "\t\t" + echo -e "\t\t" awk -f build_tools/get_moduledeps ${file} echo -e "\t\t" done diff --git a/build_tools/sounds.xml b/build_tools/sounds.xml index 0f118f155c..e5157a94da 100644 --- a/build_tools/sounds.xml +++ b/build_tools/sounds.xml @@ -1,19 +1,33 @@ - - - + + + + + + yes - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/cdr/Makefile b/cdr/Makefile index d6ec161d21..95020694d7 100644 --- a/cdr/Makefile +++ b/cdr/Makefile @@ -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. @@ -35,6 +35,8 @@ ifneq ($(TDS_LIB),) endif endif +MODS:=$(patsubst %,%.so,$(SELECTED_MODS)) + all: depend $(MODS) install: all diff --git a/channels/Makefile b/channels/Makefile index 4a8d43b4a5..060d4e1fbc 100644 --- a/channels/Makefile +++ b/channels/Makefile @@ -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 @@ ifeq ($(OSARCH),SunOS) 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 @@ -62,6 +62,8 @@ ifndef PWLIBDIR PWLIBDIR=$(HOME)/pwlib endif +MODS:=$(patsubst %,%.so,$(SELECTED_MODS)) + all: depend $(MODS) clean-depend: diff --git a/codecs/Makefile b/codecs/Makefile index 6be3e9bbb3..544f5b1164 100644 --- a/codecs/Makefile +++ b/codecs/Makefile @@ -11,27 +11,18 @@ # 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) clean-depend: diff --git a/codecs/codec_g723_1.c b/codecs/codec_g723_1.c index 00a5ca635d..87ccba82ea 100644 --- a/codecs/codec_g723_1.c +++ b/codecs/codec_g723_1.c @@ -27,6 +27,10 @@ * \ingroup codecs */ +/*** MODULEINFO + no + ***/ + #define TYPE_HIGH 0x0 #define TYPE_LOW 0x1 #define TYPE_SILENCE 0x2 diff --git a/formats/Makefile b/formats/Makefile index dab3a39229..1eb7e29fff 100644 --- a/formats/Makefile +++ b/formats/Makefile @@ -11,10 +11,12 @@ # 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) clean-depend: diff --git a/funcs/Makefile b/funcs/Makefile index 33edf55d2d..757f2accf2 100644 --- a/funcs/Makefile +++ b/funcs/Makefile @@ -11,19 +11,21 @@ # 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) clean-depend: diff --git a/pbx/Makefile b/pbx/Makefile index e799c535e6..8ca959688e 100644 --- a/pbx/Makefile +++ b/pbx/Makefile @@ -11,7 +11,7 @@ # 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 @@ -19,6 +19,8 @@ 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) clean-depend: diff --git a/res/Makefile b/res/Makefile index 3081a8bef1..8de05f30b8 100644 --- a/res/Makefile +++ b/res/Makefile @@ -11,29 +11,31 @@ # 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) install: all diff --git a/res/res_snmp.c b/res/res_snmp.c index 39e2cdb363..5fb48d5d4c 100644 --- a/res/res_snmp.c +++ b/res/res_snmp.c @@ -141,13 +141,3 @@ const char *description(void) { 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: - */ diff --git a/utils/Makefile b/utils/Makefile index b5119260f4..dc31d2708d 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -26,7 +26,7 @@ ifeq ($(NEWT_LIB),) 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