Merged revisions 187721 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r187721 | kpfleming | 2009-04-10 11:51:44 -0500 (Fri, 10 Apr 2009) | 5 lines

  clean up some patterns for files to remove

  add embedding support for bridge and test modules
........

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

diff --git a/build_tools/embed_modules.xml b/build_tools/embed_modules.xml
index 054e1dfadca78a0eebd8eef4467be64aa04229ec..214392cb145899912fd30862b1652e573e1f0ca9 100644 (file)
--- a/build_tools/embed_modules.xml
+++ b/build_tools/embed_modules.xml
@@ -5,10 +5,10 @@
                <member name="CDR" displayname="Call Detail Recording" remove_on_change="cdr/*.o">
                        <depend>gnu_ld</depend>
                </member>
-               <member name="CHANNELS" displayname="Channels" remove_on_change="channels/*.o channels/misdn/*.o">
+               <member name="CHANNELS" displayname="Channels" remove_on_change="channels/*.o channels/*/*.o">
                        <depend>gnu_ld</depend>
                </member>
-               <member name="CODECS" displayname="Coders/Decoders" remove_on_change="codecs/*.o codecs/gsm/src/*.o codecs/ilbc/*.o codecs/lpc10/*.o codecs/gsm/lib/libgsm.a codecs/lpc10/liblpc10.a codecs/ilbc/libilbc.a codecs/g722/libg722.a">
+               <member name="CODECS" displayname="Coders/Decoders" remove_on_change="codecs/*.o codecs/*/*.o codecs/*/*/*.o codecs/*/*.a codecs/*/*/*.a">
                        <depend>gnu_ld</depend>
                </member>
                <member name="FORMATS" displayname="File Formats" remove_on_change="formats/*.o">
@@ -17,10 +17,13 @@
                <member name="FUNCS" displayname="Dialplan Functions" remove_on_change="funcs/*.o">
                        <depend>gnu_ld</depend>
                </member>
-               <member name="PBX" displayname="PBX Functionality" remove_on_change="pbx/*.o pbx/ael/*.o">
+               <member name="PBX" displayname="PBX Functionality" remove_on_change="pbx/*.o pbx/*/*.o">
                        <depend>gnu_ld</depend>
                </member>
-               <member name="RES" displayname="Resource Modules" remove_on_change="res/*.o res/snmp/*.o">
+               <member name="RES" displayname="Resource Modules" remove_on_change="res/*.o res/*/*.o">
+                       <depend>gnu_ld</depend>
+               </member>
+               <member name="TEST" displayname="Test Modules" remove_on_change="tests/*.o">
                        <depend>gnu_ld</depend>
                </member>
        </category>