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.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@204415 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/Makefile.moddir_rules b/Makefile.moddir_rules
index 1db15ecb10828df8d9d7fa7339f36ee48a860f9e..9053d2329da701be7b4e6357a5ecd8adf7da39cb 100644 (file)
--- a/Makefile.moddir_rules
+++ b/Makefile.moddir_rules
@@ -38,19 +38,18 @@ include $(ASTTOPDIR)/Makefile.rules
 
 ifneq ($(MODULE_PREFIX),)
     ALL_C_MODS:=
-    ALL_C_MODS+=$(foreach p,$(MODULE_PREFIX),$(patsubst %.c,%,$(wildcard $(p)_*.c)))
     ALL_CC_MODS:=
+    ALL_C_MODS+=$(foreach p,$(MODULE_PREFIX),$(patsubst %.c,%,$(wildcard $(p)_*.c)))
     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))
-
-    # 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
+C_MODS:=$(filter-out $(MENUSELECT_$(MENUSELECT_CATEGORY)),$(ALL_C_MODS))
+CC_MODS:=$(filter-out $(MENUSELECT_$(MENUSELECT_CATEGORY)),$(ALL_CC_MODS))
+
+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

diff --git a/addons/Makefile b/addons/Makefile
index c937597028ec031a286acef5971d4076e5b00ff5..1b2b177248607b9790393f12629d62e00e29613c 100644 (file)
--- a/addons/Makefile
+++ b/addons/Makefile
@@ -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 @@ H323OBJS:=ooCmdChannel.o ooLogChan.o ooUtils.o ooGkClient.o context.o \
 
 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

diff --git a/build_tools/embed_modules.xml b/build_tools/embed_modules.xml
index 0e50a9e4dbaddd19d34caf6ab2a071bd8622b59e..c38be803195563d502f5ffa88a43692d5e55beab 100644 (file)
--- a/build_tools/embed_modules.xml
+++ b/build_tools/embed_modules.xml
@@ -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>