diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-30 17:04:35 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-30 17:04:35 +0000 |
| commit | 0a6e138eed428c53bb15cdeee670574a5185c160 (patch) | |
| tree | 1e349900ff082e5765cc44caed2d94b816ba3afb /build_tools | |
| parent | e9d15cbea7a98184521c851500176da7aa424012 (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@204415 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'build_tools')
| -rw-r--r-- | build_tools/embed_modules.xml | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/build_tools/embed_modules.xml b/build_tools/embed_modules.xml index 0e50a9e4d..c38be8031 100644 --- 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> |