[svn-commits] rizzo: trunk r93580 - /trunk/Makefile.moddir_rules

[SVN commits to the Digium repositories]

Author: rizzo
Date: Tue Dec 18 02:56:16 2007
New Revision: 93580

URL: http://svn.digium.com/view/asterisk?view=rev&rev=93580
Log:
make the code match documentation - now you can specify multiple
words in MODULE_PREFIX.


Modified:
    trunk/Makefile.moddir_rules

Modified: trunk/Makefile.moddir_rules
URL: http://svn.digium.com/view/asterisk/trunk/Makefile.moddir_rules?view=diff&rev=93580&r1=93579&r2=93580
==============================================================================
--- trunk/Makefile.moddir_rules (original)
+++ trunk/Makefile.moddir_rules Tue Dec 18 02:56:16 2007
@@ -37,13 +37,17 @@
 # If MODULE_PREFIX is defined, use it to run the standard functions to set
 # C_MODS, CC_MODS, LOADABLE_MODS and EMBEDDED_MODS.
 # Each word of MODULE_PREFIX is a prefix for filenames that we consider
-# valid C or CC modules (eg. app_, func_ ...).
+# valid C or CC modules (eg. app, func ...). Note that the underscore
+# is added here, and does not need to be in MODULE_PREFIX
+#
 # Use MODULE_EXCLUDE to specify additional modules to exclude.
 
 ifneq ($(MODULE_PREFIX),)
-    ALL_C_MODS:=$(patsubst %.c,%,$(wildcard $(MODULE_PREFIX)_*.c))
-    ALL_CC_MODS:=$(patsubst %.cc,%,$(wildcard $(MODULE_PREFIX)_*.cc))
-
+    ALL_C_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)))
+ 
     C_MODS:=$(filter-out $(MENUSELECT_$(MENUSELECT_CATEGORY)),$(ALL_C_MODS))
     CC_MODS:=$(filter-out $(MENUSELECT_$(MENUSELECT_CATEGORY)),$(ALL_CC_MODS))