[asterisk-commits] branch group/autoconf_and_menuselect r10841 - in
/team/group/autoconf_and_men...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Wed Feb 22 17:04:21 MST 2006
Author: russell
Date: Wed Feb 22 18:04:17 2006
New Revision: 10841
URL: http://svn.digium.com/view/asterisk?rev=10841&view=rev
Log:
update the rest of the Makefiles to filter-out modules disabled through menuselect
Modified:
team/group/autoconf_and_menuselect/Makefile
team/group/autoconf_and_menuselect/build_tools/menuselect.c
team/group/autoconf_and_menuselect/build_tools/menuselect.h
team/group/autoconf_and_menuselect/channels/Makefile
team/group/autoconf_and_menuselect/channels/makeopts.xml
team/group/autoconf_and_menuselect/formats/Makefile
team/group/autoconf_and_menuselect/formats/makeopts.xml
team/group/autoconf_and_menuselect/formats/msgsm.h
team/group/autoconf_and_menuselect/pbx/Makefile
team/group/autoconf_and_menuselect/pbx/makeopts.xml
team/group/autoconf_and_menuselect/res/Makefile
team/group/autoconf_and_menuselect/res/makeopts.xml
Modified: team/group/autoconf_and_menuselect/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/Makefile?rev=10841&r1=10840&r2=10841&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/Makefile (original)
+++ team/group/autoconf_and_menuselect/Makefile Wed Feb 22 18:04:17 2006
@@ -181,8 +181,8 @@
include ~/.asterisk.makeopts
endif
-ifneq ($(wildcard asterisk.makeopts),)
- include asterisk.makeopts
+ifneq ($(wildcard menuselect.makeopts),)
+ include menuselect.makeopts
ASTCFLAGS+= $(MAKEOPTS_CFLAGS)
endif
@@ -447,7 +447,7 @@
all: cleantest depend asterisk subdirs
makeopts:
- @test -f asterisk.makeopts || ( echo "You must run ./configure and make menuselect!" && exit 1 )
+ @test -f menuselect.makeopts || ( echo "You must run ./configure and make menuselect!" && exit 1 )
#ifneq ($(wildcard tags),)
ctags: tags
@@ -966,5 +966,5 @@
$(MAKE) -C build_tools _menuselect
mxml/libmxml.a: FORCE
- @cd mxml && test -f config.h || ./configure
+ @cd mxml && unset CFLAGS && test -f config.h || ./configure
$(MAKE) -C mxml libmxml.a
Modified: team/group/autoconf_and_menuselect/build_tools/menuselect.c
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/build_tools/menuselect.c?rev=10841&r1=10840&r2=10841&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/build_tools/menuselect.c (original)
+++ team/group/autoconf_and_menuselect/build_tools/menuselect.c Wed Feb 22 18:04:17 2006
@@ -354,7 +354,7 @@
int i;
int res = -1;
- for (i = 0; makeopts_files[i]; i++) {
+ for (i = 0; i < (sizeof(makeopts_files) / sizeof(makeopts_files[0])); i++) {
if ((res = parse_makeopts_xml(makeopts_files[i]))) {
fprintf(stderr, "Error parsing '%s'!\n", makeopts_files[i]);
break;
@@ -547,9 +547,9 @@
int i;
wclear(win);
- for (i = 0; help_info[i]; i++) {
+ for (i = 0; i < (sizeof(help_info) / sizeof(help_info[0])); i++) {
wmove(win, i, max_x / 2 - 15);
- waddstr(win, help_info[i]);
+ waddstr(win, help_info[i]);
}
wrefresh(win);
getch(); /* display the help until the user hits a key */
Modified: team/group/autoconf_and_menuselect/build_tools/menuselect.h
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/build_tools/menuselect.h?rev=10841&r1=10840&r2=10841&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/build_tools/menuselect.h (original)
+++ team/group/autoconf_and_menuselect/build_tools/menuselect.h Wed Feb 22 18:04:17 2006
@@ -29,7 +29,7 @@
#define TITLE_HEIGHT 5
-#define OUTPUT_MAKEOPTS_DEFAULT "asterisk.makeopts"
+#define OUTPUT_MAKEOPTS_DEFAULT "menuselect.makeopts"
#define MENUSELECT_DEPS "autoconf/menuselect-deps"
const char * const help_info[] = {
@@ -42,7 +42,6 @@
"save and quit => x",
"",
"XXX means dependencies havenot been met",
- NULL
};
const char * const makeopts_files[] = {
@@ -53,5 +52,4 @@
"pbx/makeopts.xml",
"res/makeopts.xml",
"utils/makeopts.xml",
- NULL
};
Modified: team/group/autoconf_and_menuselect/channels/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/channels/Makefile?rev=10841&r1=10840&r2=10841&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/channels/Makefile (original)
+++ team/group/autoconf_and_menuselect/channels/Makefile Wed Feb 22 18:04:17 2006
@@ -15,6 +15,8 @@
#
MODS:=$(patsubst %.c,%.so,$(wildcard chan_*.c))
+
+MODS:=$(filter-out $(MENUSELECT_CHANNELS),$(MODS))
ifeq (${OSARCH},OpenBSD)
PTLIB=-lpt_OpenBSD_x86_r
@@ -70,10 +72,6 @@
CFLAGS+=-DWITH_SMDI
endif
-ifeq ($(wildcard h323/libchanh323.a),)
- MODS:=$(filter-out chan_h323.so,$(MODS))
-endif
-
ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/mISDNuser/mISDNlib.h),)
MODS:=$(filter-out chan_misdn.so,$(MODS))
else
@@ -81,10 +79,6 @@
endif
CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
-
-ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/alsa/asoundlib.h),)
- MODS:=$(filter-out chan_alsa.so,$(MODS))
-endif
ifndef WITHOUT_PRI
ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1 $(CROSS_COMPILE_TARGET)/usr/local/lib/libpri.so.1),)
@@ -121,12 +115,6 @@
CFLAGS+=-DIAX_TRUNKING
endif
-ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vpbapi.h),)
- MODS:=$(filter-out chan_vpb.so,$(MODS))
-else
- CFLAGS+=-DLINUX
-endif
-
CFLAGS+=-DCRYPTO
ifneq ($(OSARCH),CYGWIN)
@@ -136,10 +124,6 @@
CFLAGS+=#-DVOFRDUMPER
ZAPDIR=/usr/lib
-
-ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/nbs.h),)
- MODS:=$(filter-out chan_nbs.so,$(MODS))
-endif
ifndef OPENH323DIR
OPENH323DIR=$(HOME)/openh323
Modified: team/group/autoconf_and_menuselect/channels/makeopts.xml
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/channels/makeopts.xml?rev=10841&r1=10840&r2=10841&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/channels/makeopts.xml (original)
+++ team/group/autoconf_and_menuselect/channels/makeopts.xml Wed Feb 22 18:04:17 2006
@@ -1,11 +1,15 @@
<?xml version="1.0"?>
<category>
- <name>CHANNEL_LIBS</name>
+ <name>MENUSELECT_CHANNELS</name>
<displayname>Channel Drivers</displayname>
<member>
<name>chan_agent.so</name>
<description>Agent Proxy Channel Driver</description>
+ </member>
+ <member>
+ <name>chan_alsa.so</name>
+ <depend>asound</depend>
</member>
<member>
<name>chan_features.so</name>
Modified: team/group/autoconf_and_menuselect/formats/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/formats/Makefile?rev=10841&r1=10840&r2=10841&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/formats/Makefile (original)
+++ team/group/autoconf_and_menuselect/formats/Makefile Wed Feb 22 18:04:17 2006
@@ -13,12 +13,7 @@
MODS:=$(patsubst %.c,%.so,$(wildcard format_*.c))
-#
-# OGG/Vorbis format
-#
-ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vorbis/codec.h),)
- MODS:=$(filter-out format_ogg_vorbis.so,$(MODS))
-endif
+MODS:=$(filter-out $(MENUSELECT_FORMATS),$(MODS))
GSMLIB=../codecs/gsm/lib/libgsm.a
Modified: team/group/autoconf_and_menuselect/formats/makeopts.xml
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/formats/makeopts.xml?rev=10841&r1=10840&r2=10841&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/formats/makeopts.xml (original)
+++ team/group/autoconf_and_menuselect/formats/makeopts.xml Wed Feb 22 18:04:17 2006
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<category>
- <name>FORMAT_LIBS</name>
+ <name>MENUSELECT_FORMATS</name>
<displayname>Formats</displayname>
<member>
<name>format_au.so</name>
@@ -16,7 +16,6 @@
<member>
<name>format_g729.so</name>
</member>
-
<member>
<name>format_gsm.so</name>
</member>
Modified: team/group/autoconf_and_menuselect/formats/msgsm.h
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/formats/msgsm.h?rev=10841&r1=10840&r2=10841&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/formats/msgsm.h (original)
+++ team/group/autoconf_and_menuselect/formats/msgsm.h Wed Feb 22 18:04:17 2006
@@ -457,7 +457,9 @@
unsigned int sr = 0;
unsigned int frame_chain;
unsigned int LARc[8], Nc[4], Mc[4], bc[4], xmaxc[4], xmc[13*4];
-
+
+ xmc[48] = 0;
+
sr = *c++;
LARc[0] = sr & 0x3f; sr >>= 6;
sr |= (uword)*c++ << 2;
Modified: team/group/autoconf_and_menuselect/pbx/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/pbx/Makefile?rev=10841&r1=10840&r2=10841&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/pbx/Makefile (original)
+++ team/group/autoconf_and_menuselect/pbx/Makefile Wed Feb 22 18:04:17 2006
@@ -13,15 +13,7 @@
MODS:=$(patsubst %.c,%.so,$(wildcard pbx_*.c))
-#GTK=$(shell $(CROSS_COMPILE_BIN)gtk-config --cflags >/dev/null 2>/dev/null && echo "OK")
-ifeq (${GTK},)
- MODS:=$(filter-out pbx_gtkconsole.so,$(MODS))
-endif
-
-#KDE=$(shell [ "$$QTDIR" != "" ] && echo "OK")
-ifeq (${GTK},)
- MODS:=$(filter-out pbx_kdeconsole.so,$(MODS))
-endif
+MODS:=$(filter-out $(MENUSELECT_PBX),$(MODS))
GTK_FLAGS=`${CROSS_COMPILE_BIN}gtk-config --cflags gthread`
GTK_LIBS=`${CROSS_COMPILE_BIN}gtk-config --libs gthread`
Modified: team/group/autoconf_and_menuselect/pbx/makeopts.xml
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/pbx/makeopts.xml?rev=10841&r1=10840&r2=10841&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/pbx/makeopts.xml (original)
+++ team/group/autoconf_and_menuselect/pbx/makeopts.xml Wed Feb 22 18:04:17 2006
@@ -1,16 +1,24 @@
<?xml version="1.0"?>
<category>
- <name>PBX_LIBS</name>
+ <name>MENUSELECT_PBX</name>
<displayname>PBX Modules</displayname>
+ <member>
+ <name>pbx_ael.so</name>
+ </member>
<member>
<name>pbx_config.so</name>
</member>
<member>
- <name>pbx_spool.so</name>
+ <name>pbx_dundi.so</name>
</member>
<member>
- <name>pbx_dundi.so</name>
+ <name>pbx_gtkconsole.so</name>
+ <depend>gtk</depend>
+ </member>
+ <member>
+ <name>pbx_kdeconsole.so</name>
+ <depend>qt</depend>
</member>
<member>
<name>pbx_loopback.so</name>
@@ -19,7 +27,7 @@
<name>pbx_realtime.so</name>
</member>
<member>
- <name>pbx_ael.so</name>
+ <name>pbx_spool.so</name>
</member>
</category>
Modified: team/group/autoconf_and_menuselect/res/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/res/Makefile?rev=10841&r1=10840&r2=10841&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/res/Makefile (original)
+++ team/group/autoconf_and_menuselect/res/Makefile Wed Feb 22 18:04:17 2006
@@ -13,10 +13,9 @@
MODS:=$(patsubst %.c,%.so,$(wildcard res_*.c))
-ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h $(CROSS_COMPILE_TARGET)/usr/local/include/odbcinst.h),)
- MODS:=$(filter-out res_odbc.so,$(MODS))
- MODS:=$(filter-out res_config_odbc.so,$(MODS))
-else
+MODS:=$(filter-out $(MENUSELECT_RES),$(MODS))
+
+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h $(CROSS_COMPILE_TARGET)/usr/local/include/odbcinst.h),)
ifeq (${OSARCH},FreeBSD)
MODS:=$(filter-out $(shell if test ${BSDVERSION} -lt 500000 ; then echo "res_config_odbc.so"; fi),$(MODS))
endif
@@ -28,13 +27,6 @@
endif
OSPLIB:=$(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libosptk.a $(CROSS_COMPILE_TARGET)/usr/local/lib/libosptk.a)
-ifeq (${OSPLIB},)
- MODS:=$(filter-out res_osp.so,$(MODS))
-endif
-
-ifeq (${WITH_SMDI},)
- MODS:=$(filter-out res_smdi.so,$(MODS))
-endif
ifeq (${OSARCH},CYGWIN)
CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols
Modified: team/group/autoconf_and_menuselect/res/makeopts.xml
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/res/makeopts.xml?rev=10841&r1=10840&r2=10841&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/res/makeopts.xml (original)
+++ team/group/autoconf_and_menuselect/res/makeopts.xml Wed Feb 22 18:04:17 2006
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<category>
- <name>RES_MODULES</name>
+ <name>MENUSELECT_RES</name>
<displayname>Resources</displayname>
<member>
<name>res_adsi.so</name>
@@ -41,4 +41,7 @@
<name>res_osp.so</name>
<depend>libosptk</depend>
</member>
+ <member>
+ <name>res_smdi.so</name>
+ </member>
</category>
More information about the asterisk-commits
mailing list