diff options
author | Kevin P. Fleming <kpfleming@digium.com> | 2006-06-05 20:46:27 +0000 |
---|---|---|
committer | Kevin P. Fleming <kpfleming@digium.com> | 2006-06-05 20:46:27 +0000 |
commit | e856010714a91f3cf784fb3a951fdbc348e05f32 (patch) | |
tree | d5827333b38eac990d3ee179fd35122c76faa02d /res/Makefile | |
parent | 8a95a1ddc10aa322eebd64b71a0ff546e1b6af50 (diff) |
use module names, not file names, in menuselect
work around XML parsing bug in menuselect for default sounds package
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@32407 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/Makefile')
-rw-r--r-- | res/Makefile | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/res/Makefile b/res/Makefile index 3081a8bef..8de05f30b 100644 --- a/res/Makefile +++ b/res/Makefile @@ -11,29 +11,31 @@ # the GNU General Public License # -MODS:=$(filter-out $(MENUSELECT_RES),$(patsubst %.c,%.so,$(wildcard res_*.c))) +SELECTED_MODS:=$(filter-out $(MENUSELECT_RES),$(patsubst %.c,%,$(wildcard res_*.c))) ifeq ($(OSARCH),FreeBSD) - MODS:=$(filter-out $(shell if test ${BSDVERSION} -lt 500000 ; then echo "res_config_odbc.so"; fi),$(MODS)) + SELECTED_MODS:=$(filter-out $(shell if test ${BSDVERSION} -lt 500000 ; then echo "res_config_odbc"; fi),$(SELECTED_MODS)) endif # NETsnmp has some difficulties on some platforms (conflict with unload_module) # Until we figure out if the collission is version-specific or what to do # we have disabled res_snmp on OS/X and *BSD ifeq ($(OSARCH),Darwin) - MODS:=$(filter-out res_snmp.so,$(MODS)) + SELECTED_MODS:=$(filter-out res_snmp,$(SELECTED_MODS)) else ifeq ($(findstring BSD,$(OSARCH)),BSD) - MODS:=$(filter-out res_snmp.so,$(MODS)) + SELECTED_MODS:=$(filter-out res_snmp,$(SELECTED_MODS)) endif endif ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/net-snmp/net-snmp-config.h),) - MODS:=$(filter-out res_snmp.so,$(MODS)) + SELECTED_MODS:=$(filter-out res_snmp,$(SELECTED_MODS)) else SNMP_LDLIBS+=$(shell net-snmp-config --agent-libs) endif +MODS:=$(patsubst %,%.so,$(SELECTED_MODS)) + all: depend $(MODS) install: all |