[svn-commits] kpfleming: trunk r204415 - in /trunk: ./ addons/ build_tools/

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Tue Jun 30 12:04:35 2009
New Revision: 204415

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=204415
Log:
Add-ons related build system improvements.

Ensure that add-on modules can be embedded, fix up Makefile.moddir_rules
to allow module directory Makefiles to more easily specify the modules to
be built, and explicitly list the addons modules in its Makefile, since
the module names don't follow any pattern.


Modified:
    trunk/Makefile.moddir_rules
    trunk/addons/Makefile
    trunk/build_tools/embed_modules.xml

Modified: trunk/Makefile.moddir_rules
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/Makefile.moddir_rules?view=diff&rev=204415&r1=204414&r2=204415
==============================================================================
--- trunk/Makefile.moddir_rules (original)
+++ trunk/Makefile.moddir_rules Tue Jun 30 12:04:35 2009
@@ -38,19 +38,18 @@
 
 ifneq ($(MODULE_PREFIX),)
     ALL_C_MODS:=
+    ALL_CC_MODS:=
     ALL_C_MODS+=$(foreach p,$(MODULE_PREFIX),$(patsubst %.c,%,$(wildcard $(p)_*.c)))
-    ALL_CC_MODS:=
     ALL_CC_MODS+=$(foreach p,$(MODULE_PREFIX),$(patsubst %.cc,%,$(wildcard $(p)_*.cc)))
+endif
  
-    C_MODS:=$(filter-out $(MENUSELECT_$(MENUSELECT_CATEGORY)),$(ALL_C_MODS))
-    CC_MODS:=$(filter-out $(MENUSELECT_$(MENUSELECT_CATEGORY)),$(ALL_CC_MODS))
+C_MODS:=$(filter-out $(MENUSELECT_$(MENUSELECT_CATEGORY)),$(ALL_C_MODS))
+CC_MODS:=$(filter-out $(MENUSELECT_$(MENUSELECT_CATEGORY)),$(ALL_CC_MODS))
 
-    # and store in the list of embedded or loadable modules
-    ifneq ($(findstring $(MENUSELECT_CATEGORY),$(MENUSELECT_EMBED)),)
-	EMBEDDED_MODS:=$(C_MODS) $(CC_MODS)
-    else
-	LOADABLE_MODS:=$(C_MODS) $(CC_MODS)
-    endif
+ifneq ($(findstring $(MENUSELECT_CATEGORY),$(MENUSELECT_EMBED)),)
+    EMBEDDED_MODS:=$(C_MODS) $(CC_MODS)
+else
+    LOADABLE_MODS:=$(C_MODS) $(CC_MODS)
 endif
 
 # Both C++ and C++ sources need their module name in AST_MODULE

Modified: trunk/addons/Makefile
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/addons/Makefile?view=diff&rev=204415&r1=204414&r2=204415
==============================================================================
--- trunk/addons/Makefile (original)
+++ trunk/addons/Makefile Tue Jun 30 12:04:35 2009
@@ -11,7 +11,6 @@
 
 -include $(ASTTOPDIR)/menuselect.makeopts $(ASTTOPDIR)/menuselect.makedeps
 
-MODULE_PREFIX=app bridge cdr cel chan codec format func pbx res test
 MENUSELECT_CATEGORY=Addons
 MENUSELECT_DESCRIPTION=Add-ons (See README-addons.txt)
 
@@ -27,6 +26,14 @@
 
 H323CFLAGS:=-Iooh323c/src -Iooh323c/src/h323
 
+ALL_C_MODS:=app_addon_sql_mysql \
+            app_saycountpl \
+            cdr_addon_mysql \
+            chan_mobile \
+            chan_ooh323 \
+            format_mp3 \
+            res_config_mysql
+
 all: _all
 
 include $(ASTTOPDIR)/Makefile.moddir_rules

Modified: trunk/build_tools/embed_modules.xml
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/build_tools/embed_modules.xml?view=diff&rev=204415&r1=204414&r2=204415
==============================================================================
--- trunk/build_tools/embed_modules.xml (original)
+++ trunk/build_tools/embed_modules.xml Tue Jun 30 12:04:35 2009
@@ -1,32 +1,35 @@
 	<category name="MENUSELECT_EMBED" displayname="Module Embedding" positive_output="yes" remove_on_change="main/asterisk">
-		<member name="APPS" displayname="Applications" remove_on_change="apps/*.o">
+		<member name="ADDONS" displayname="Add-ons" remove_on_change="addons/*.o addons/*.oo">
 			<depend>gnu_ld</depend>
 		</member>
-		<member name="BRIDGES" displayname="Bridging Technologies" remove_on_change="bridges/*.o">
+		<member name="APPS" displayname="Applications" remove_on_change="apps/*.o apps/*.oo">
 			<depend>gnu_ld</depend>
 		</member>
-		<member name="CDR" displayname="Call Detail Recording" remove_on_change="cdr/*.o">
+		<member name="BRIDGES" displayname="Bridging Technologies" remove_on_change="bridges/*.o bridges/*.oo">
 			<depend>gnu_ld</depend>
 		</member>
-		<member name="CHANNELS" displayname="Channels" remove_on_change="channels/*.o channels/*/*.o">
+		<member name="CDR" displayname="Call Detail Recording" remove_on_change="cdr/*.o cdr/*.oo">
 			<depend>gnu_ld</depend>
 		</member>
-		<member name="CODECS" displayname="Coders/Decoders" remove_on_change="codecs/*.o codecs/*/*.o codecs/*/*/*.o codecs/*/*.a codecs/*/*/*.a">
+		<member name="CHANNELS" displayname="Channels" remove_on_change="channels/*.o channels/*/*.o channels/*.oo channels/*/*.oo">
 			<depend>gnu_ld</depend>
 		</member>
-		<member name="FORMATS" displayname="File Formats" remove_on_change="formats/*.o">
+		<member name="CODECS" displayname="Coders/Decoders" remove_on_change="codecs/*.o codecs/*/*.o codecs/*/*/*.o codecs/*/*.a codecs/*/*/*.a codecs/*.oo codecs/*/*.oo">
 			<depend>gnu_ld</depend>
 		</member>
-		<member name="FUNCS" displayname="Dialplan Functions" remove_on_change="funcs/*.o">
+		<member name="FORMATS" displayname="File Formats" remove_on_change="formats/*.o formats/*.oo">
 			<depend>gnu_ld</depend>
 		</member>
-		<member name="PBX" displayname="PBX Functionality" remove_on_change="pbx/*.o pbx/*/*.o">
+		<member name="FUNCS" displayname="Dialplan Functions" remove_on_change="funcs/*.o funcs/*.oo">
 			<depend>gnu_ld</depend>
 		</member>
-		<member name="RES" displayname="Resource Modules" remove_on_change="res/*.o res/*/*.o">
+		<member name="PBX" displayname="PBX Functionality" remove_on_change="pbx/*.o pbx/*/*.o pbx/*.oo pbx/*/*.oo">
 			<depend>gnu_ld</depend>
 		</member>
-		<member name="TEST" displayname="Test Modules" remove_on_change="tests/*.o">
+		<member name="RES" displayname="Resource Modules" remove_on_change="res/*.o res/*/*.o res/*.oo res/*/*.oo">
+			<depend>gnu_ld</depend>
+		</member>
+		<member name="TEST" displayname="Test Modules" remove_on_change="tests/*.o tests/*.oo">
 			<depend>gnu_ld</depend>
 		</member>
 	</category>