From f92cdf3831783be2403b47585a665a1b52b3c21e Mon Sep 17 00:00:00 2001 From: Luigi Rizzo Date: Tue, 18 Dec 2007 08:56:16 +0000 Subject: make the code match documentation - now you can specify multiple words in MODULE_PREFIX. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@93580 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- Makefile.moddir_rules | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'Makefile.moddir_rules') diff --git a/Makefile.moddir_rules b/Makefile.moddir_rules index fea69a2e2..9258e8d63 100644 --- a/Makefile.moddir_rules +++ b/Makefile.moddir_rules @@ -37,13 +37,17 @@ include $(ASTTOPDIR)/Makefile.rules # 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)) -- cgit v1.2.3