[asterisk-commits] branch group/autoconf_and_menuselect r11050 - in
/team/group/autoconf_and_men...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Fri Feb 24 20:28:46 MST 2006
Author: russell
Date: Fri Feb 24 21:28:42 2006
New Revision: 11050
URL: http://svn.digium.com/view/asterisk?rev=11050&view=rev
Log:
update channels with MODULEINFO
Removed:
team/group/autoconf_and_menuselect/channels/makeopts.xml
Modified:
team/group/autoconf_and_menuselect/apps/Makefile
team/group/autoconf_and_menuselect/autoconf/menuselect-deps.in
team/group/autoconf_and_menuselect/channels/Makefile
team/group/autoconf_and_menuselect/channels/chan_alsa.c
team/group/autoconf_and_menuselect/channels/chan_h323.c
team/group/autoconf_and_menuselect/channels/chan_nbs.c
team/group/autoconf_and_menuselect/channels/chan_phone.c
team/group/autoconf_and_menuselect/channels/chan_vpb.c
team/group/autoconf_and_menuselect/channels/chan_zap.c
team/group/autoconf_and_menuselect/pbx/Makefile
Modified: team/group/autoconf_and_menuselect/apps/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/apps/Makefile?rev=11050&r1=11049&r2=11050&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/apps/Makefile (original)
+++ team/group/autoconf_and_menuselect/apps/Makefile Fri Feb 24 21:28:42 2006
@@ -12,24 +12,6 @@
#
MODS:=$(filter-out $(MENUSELECT_APPS),$(patsubst %.c,%.so,$(wildcard app_*.c)))
-
-#
-# Experimental things
-#
-MODS:=$(filter-out app_ivrdemo.so,$(MODS))
-MODS:=$(filter-out app_skel.so,$(MODS))
-
-ifndef WITHOUT_ZAPTEL
-ZAPAVAIL:=$(ZAPTEL)
-endif
-
-ifneq (${ZAPAVAIL},1)
- MODS:=$(filter-out app_rpt.so app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so app_page.so,$(MODS))
-endif
-
-ifneq ($(LIBOSPTK),1)
- MODS:=$(filter-out app_osplookup.so,$(MODS))
-endif
ifneq (${WITH_SMDI},)
CFLAGS+=-DWITH_SMDI
Modified: team/group/autoconf_and_menuselect/autoconf/menuselect-deps.in
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/autoconf/menuselect-deps.in?rev=11050&r1=11049&r2=11050&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/autoconf/menuselect-deps.in (original)
+++ team/group/autoconf_and_menuselect/autoconf/menuselect-deps.in Fri Feb 24 21:28:42 2006
@@ -3,6 +3,7 @@
FREETDS=@PBX_FREETDS@
GTK=@PBX_GTK@
H323=@PBX_H323@
+IXJUSER=@PBX_IXJUSER@
KDE=@PBX_KDE@
LIBMFCR2=@PBX_LIBMFCR2@
LIBNEWT=@PBX_LIBNEWT@
@@ -19,7 +20,7 @@
PTLIB=@PBX_PTLIB@
QT=@PBX_QT@
SQLITE=@PBX_SQLITE@
+SSL=@HAVE_LIBSSL@
UNIXODBC=@HAVE_UNIXODBC@
VPBAPI=@PBX_VPBAPI@
ZAPTEL=@PBX_ZAPTEL@
-SSL=@HAVE_LIBSSL@
Modified: team/group/autoconf_and_menuselect/channels/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/channels/Makefile?rev=11050&r1=11049&r2=11050&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/channels/Makefile (original)
+++ team/group/autoconf_and_menuselect/channels/Makefile Fri Feb 24 21:28:42 2006
@@ -60,10 +60,6 @@
ifeq (${OSARCH},CYGWIN)
MODS:=$(filter-out chan_oss.so,$(MODS))
-endif
-
-ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h $(CROSS_COMPILE_TARGET)/usr/local/include/ixjuser.h),)
- MODS:=$(filter-out chan_phone.so,$(MODS))
endif
ifeq (${WITH_SMDI},1)
Modified: team/group/autoconf_and_menuselect/channels/chan_alsa.c
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/channels/chan_alsa.c?rev=11050&r1=11049&r2=11050&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/channels/chan_alsa.c (original)
+++ team/group/autoconf_and_menuselect/channels/chan_alsa.c Fri Feb 24 21:28:42 2006
@@ -1139,3 +1139,7 @@
{
return ASTERISK_GPL_KEY;
}
+
+/*** MODULEINFO
+ <depend>asound</depend>
+ ***/
Modified: team/group/autoconf_and_menuselect/channels/chan_h323.c
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/channels/chan_h323.c?rev=11050&r1=11049&r2=11050&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/channels/chan_h323.c (original)
+++ team/group/autoconf_and_menuselect/channels/chan_h323.c Fri Feb 24 21:28:42 2006
@@ -2470,3 +2470,7 @@
{
return ASTERISK_GPL_KEY;
}
+
+/*** MODULEINFO
+ <depend>h323</depend>
+ ***/
Modified: team/group/autoconf_and_menuselect/channels/chan_nbs.c
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/channels/chan_nbs.c?rev=11050&r1=11049&r2=11050&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/channels/chan_nbs.c (original)
+++ team/group/autoconf_and_menuselect/channels/chan_nbs.c Fri Feb 24 21:28:42 2006
@@ -322,3 +322,7 @@
{
return ASTERISK_GPL_KEY;
}
+
+/*** MODULEINFO
+ <depend>nbs</depend>
+ ***/
Modified: team/group/autoconf_and_menuselect/channels/chan_phone.c
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/channels/chan_phone.c?rev=11050&r1=11049&r2=11050&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/channels/chan_phone.c (original)
+++ team/group/autoconf_and_menuselect/channels/chan_phone.c Fri Feb 24 21:28:42 2006
@@ -1436,3 +1436,7 @@
{
return ASTERISK_GPL_KEY;
}
+
+/*** MODULEINFO
+ <depend>ixjuser</depend>
+ ***/
Modified: team/group/autoconf_and_menuselect/channels/chan_vpb.c
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/channels/chan_vpb.c?rev=11050&r1=11049&r2=11050&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/channels/chan_vpb.c (original)
+++ team/group/autoconf_and_menuselect/channels/chan_vpb.c Fri Feb 24 21:28:42 2006
@@ -3055,3 +3055,7 @@
}
#endif
/**/
+
+/*** MODULEINFO
+ <depend>vpbapi</depend>
+ ***/
Modified: team/group/autoconf_and_menuselect/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/channels/chan_zap.c?rev=11050&r1=11049&r2=11050&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/channels/chan_zap.c (original)
+++ team/group/autoconf_and_menuselect/channels/chan_zap.c Fri Feb 24 21:28:42 2006
@@ -11335,3 +11335,6 @@
return ASTERISK_GPL_KEY;
}
+/*** MODULEINFO
+ <depend>zaptel</depend>
+ ***/
Modified: team/group/autoconf_and_menuselect/pbx/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/pbx/Makefile?rev=11050&r1=11049&r2=11050&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/pbx/Makefile (original)
+++ team/group/autoconf_and_menuselect/pbx/Makefile Fri Feb 24 21:28:42 2006
@@ -13,14 +13,7 @@
MODS:=$(filter-out $(MENUSELECT_PBX),$(patsubst %.c,%.so,$(wildcard pbx_*.c)))
-ifneq (${GTK},1)
- MODS:=$(filter-out pbx_gtkconsole.so,$(MODS))
-endif
-
-ifneq (${QT},1)
- MODS:=$(filter-out pbx_kdeconsole.so,$(MODS))
-endif
-
+# XXX To be removed once these are set with autoconf
GTK_FLAGS=`${CROSS_COMPILE_BIN}gtk-config --cflags gthread`
GTK_LIBS=`${CROSS_COMPILE_BIN}gtk-config --libs gthread`
MOC=$(QTDIR)/bin/moc
More information about the asterisk-commits
mailing list