diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2009-06-30 17:04:35 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2009-06-30 17:04:35 +0000 |
| commit | 3730650b4cb0988d10113dacd1644c72ca7607dc (patch) | |
| tree | 1e349900ff082e5765cc44caed2d94b816ba3afb /Makefile.moddir_rules | |
| parent | c511a2674906fd93470f0a9b77340041771466e1 (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: https://origsvn.digium.com/svn/asterisk/trunk@204415 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'Makefile.moddir_rules')
| -rw-r--r-- | Makefile.moddir_rules | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/Makefile.moddir_rules b/Makefile.moddir_rules index 1db15ecb1..9053d2329 100644 --- 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 |