[asterisk-commits] branch russell/make_menuconfig - r7461 in /team/russell/make_menuconfig: ./ res/

[asterisk-commits at lists.digium.com]

Author: russell
Date: Tue Dec 13 00:29:26 2005
New Revision: 7461

URL: http://svn.digium.com/view/asterisk?rev=7461&view=rev
Log:
add support for some of the res modules

Modified:
    team/russell/make_menuconfig/build_options.xml
    team/russell/make_menuconfig/res/Makefile

Modified: team/russell/make_menuconfig/build_options.xml
URL: http://svn.digium.com/view/asterisk/team/russell/make_menuconfig/build_options.xml?rev=7461&r1=7460&r2=7461&view=diff
==============================================================================
--- team/russell/make_menuconfig/build_options.xml (original)
+++ team/russell/make_menuconfig/build_options.xml Tue Dec 13 00:29:26 2005
@@ -273,6 +273,30 @@
 </category>
 
 <category>
+	<name>RES_MODULES</name>
+	<member>
+		<name>res_indications.so</name>
+		<description>Indications</description>
+	</member>
+	<member>
+		<name>res_monitor.so</name>
+		<description>Monitor</description>
+	</member>
+	<member>
+		<name>res_adsi.so</name>
+		<description>ADSI Support</description>
+	</member>
+	<member>
+		<name>res_agi.so</name>
+		<description>AGI</description>
+	</member>
+	<member>
+		<name>res_features.so</name>
+		<description>Call Features</description>
+	</member>
+</category>
+
+<category>
 	<name>UTILS</name>
 	<member>
 		<name>streamplayer</name>

Modified: team/russell/make_menuconfig/res/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/make_menuconfig/res/Makefile?rev=7461&r1=7460&r2=7461&view=diff
==============================================================================
--- team/russell/make_menuconfig/res/Makefile (original)
+++ team/russell/make_menuconfig/res/Makefile Tue Dec 13 00:29:26 2005
@@ -11,27 +11,29 @@
 # the GNU General Public License
 #
 
-MODS=res_indications.so res_monitor.so res_adsi.so res_agi.so res_features.so
+ifeq ($(RES_MODULES),)
+RES_MODULES=res_indications.so res_monitor.so res_adsi.so res_agi.so res_features.so
+endif
 
 ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/odbcinst.h),)
   ifneq (${OSARCH},FreeBSD)
-    MODS+=res_config_odbc.so
+    RES_MODULES+=res_config_odbc.so
   else
-    MODS+=$(shell if test ${BSDVERSION} -ge 500000 ; then echo "res_config_odbc.so"; fi)
+    RES_MODULES+=$(shell if test ${BSDVERSION} -ge 500000 ; then echo "res_config_odbc.so"; fi)
   endif
-  MODS+=res_odbc.so
+  RES_MODULES+=res_odbc.so
 endif
 
 ifneq ($(NOCRYPTO),yes)
-  MODS+=res_crypto.so
+  RES_MODULES+=res_crypto.so
 endif
 
 ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libosptk.a),)
-  MODS+=res_osp.so
+  RES_MODULES+=res_osp.so
   OSPLIB=$(CROSS_COMPILE_TARGET)/usr/lib/libosptk.a
 else
   ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libosptk.a),)
-    MODS+=res_osp.so
+    RES_MODULES+=res_osp.so
     OSPLIB=$(CROSS_COMPILE_TARGET)/usr/local/lib/libosptk.a
   endif
 endif
@@ -47,7 +49,7 @@
 CYG_RES_CONFIG_ODBC_LIB=-lres_odbc.so
 CYG_RES_FEATURES_LIB=-lres_adsi.so -lres_monitor.so
 else
-MODS+=res_musiconhold.so 
+RES_MODULES+=res_musiconhold.so 
 endif
 
 CRYPTO_LIBS=-lssl -lcrypto
@@ -69,13 +71,13 @@
 CFLAGS+=-DOPENSSL_NO_KRB5 -fPIC
 endif
 
-all: depend $(MODS)
+all: depend $(RES_MODULES)
 
 install: all
 	rm -f $(DESTDIR)$(ASTHEADERDIR)/parking.h
 	rm -f $(DESTDIR)$(MODULES_DIR)/app_agi.so 
 	rm -f $(DESTDIR)$(MODULES_DIR)/res_parking.so
-	for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
+	for x in $(RES_MODULES); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
 	@if [ x`which mpg123 2>/dev/null | grep -v '^no'` != x ] ; then \
 	  if mpg123 --longhelp 2>&1 | grep -q .59r 2>&1 >/dev/null ; then echo ; else \
 			echo "*************************************************************";\