diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-07-15 19:59:35 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-07-15 19:59:35 +0000 |
| commit | 51482ed964b007aedfa8303fa4fc5483d62279aa (patch) | |
| tree | a1180a16189aab888f84a1b9b87536d5bcf2dfa1 /Makefile.moddir_rules | |
| parent | 661a4f572c9bb0b935848a4a906795c18483bfe2 (diff) | |
more Makefile cleanup and consistency stuff
don't reuse LIBS variable from top-level Makefile (oops)
build Asterisk binary after subdirs (preparing for embedded modules)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@37661 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile.moddir_rules')
| -rw-r--r-- | Makefile.moddir_rules | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.moddir_rules b/Makefile.moddir_rules index 15beec313..0a82471e4 100644 --- a/Makefile.moddir_rules +++ b/Makefile.moddir_rules @@ -35,13 +35,13 @@ $(1).so: LIBS+=$(foreach dep,$(MENUSELECT_DEPENDS_$(1)),$$(value $(dep)_LIB)) $(1).so: LDFLAGS+=$(foreach dep,$(MENUSELECT_DEPENDS_$(1)),$$(value $(dep)_LDFLAGS)) endef -$(foreach mod,$(filter-out $(CC_MODS),$(SELECTED_MODS)),$(eval $(call module_o_c_template,$(mod)))) +$(foreach mod,$(C_MODS),$(eval $(call module_o_c_template,$(mod)))) -$(foreach mod,$(filter-out $(CC_MODS),$(SELECTED_MODS)),$(eval $(call module_so_o_template,$(mod)))) +$(foreach mod,$(C_MODS),$(eval $(call module_so_o_template,$(mod)))) -$(foreach mod,$(filter $(CC_MODS),$(SELECTED_MODS)),$(eval $(call module_oo_cc_template,$(mod)))) +$(foreach mod,$(CC_MODS),$(eval $(call module_oo_cc_template,$(mod)))) -$(foreach mod,$(filter $(CC_MODS),$(SELECTED_MODS)),$(eval $(call module_so_oo_template,$(mod)))) +$(foreach mod,$(CC_MODS),$(eval $(call module_so_oo_template,$(mod)))) .PHONY: clean clean-depend depend uninstall _all |