[asterisk-commits] branch russell/make_menuconfig - r7463 in /team/russell/make_menuconfig: ./ cdr/

[asterisk-commits at lists.digium.com]

Author: russell
Date: Tue Dec 13 00:37:24 2005
New Revision: 7463

URL: http://svn.digium.com/view/asterisk?rev=7463&view=rev
Log:
add support for a few CDR modules

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

Modified: team/russell/make_menuconfig/build_options.xml
URL: http://svn.digium.com/view/asterisk/team/russell/make_menuconfig/build_options.xml?rev=7463&r1=7462&r2=7463&view=diff
==============================================================================
--- team/russell/make_menuconfig/build_options.xml (original)
+++ team/russell/make_menuconfig/build_options.xml Tue Dec 13 00:37:24 2005
@@ -241,6 +241,22 @@
 </category>
 
 <category>
+	<name>CDR_MODULES</name>
+	<member>
+		<name>cdr_csv.so</name>
+		<description></description>
+	</member>
+	<member>
+		<name>cdr_manager.so</name>
+		<description></description>
+	</member>
+	<member>
+		<name>cdr_custom.so</name>
+		<description></description>
+	</member>
+</category>
+
+<category>
 	<name>CHANNEL_LIBS</name>
 	<member>
 		<name>chan_sip.so</name>

Modified: team/russell/make_menuconfig/cdr/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/make_menuconfig/cdr/Makefile?rev=7463&r1=7462&r2=7463&view=diff
==============================================================================
--- team/russell/make_menuconfig/cdr/Makefile (original)
+++ team/russell/make_menuconfig/cdr/Makefile Tue Dec 13 00:37:24 2005
@@ -11,7 +11,9 @@
 # the GNU General Public License
 #
 
-MODS=cdr_csv.so cdr_manager.so cdr_custom.so
+ifeq ($(CDR_MODULES),)
+CDR_MODULES=cdr_csv.so cdr_manager.so cdr_custom.so
+endif
 
 ifeq (${OSARCH},CYGWIN)
 CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols
@@ -39,7 +41,7 @@
 # unixODBC stuff...
 #
 ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/odbcinst.h),)
-  MODS+=cdr_odbc.so
+  CDR_MODULES+=cdr_odbc.so
 endif
 
 #
@@ -55,14 +57,14 @@
       CFLAGS += -DFREETDS_PRE_0_62
     endif
   endif
-  MODS+=cdr_tds.so
+  CDR_MODULES+=cdr_tds.so
 endif
 
 #
 # PGSQL stuff...  Autoconf anyone??
 #
 ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/libpq-fe.h),)
-  MODS+=cdr_pgsql.so
+  CDR_MODULES+=cdr_pgsql.so
 endif
 
 MLFLAGS=
@@ -104,13 +106,13 @@
 # SQLite stuff...
 #
 ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/sqlite.h),)
-  MODS+=cdr_sqlite.so
+  CDR_MODULES+=cdr_sqlite.so
 endif
 
-all: depend $(MODS)
+all: depend $(CDR_MODULES)
 
 install: all
-	for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
+	for x in $(CDR_MODULES); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
 
 clean:
 	rm -f *.so *.o .depend