From bb0b421ea8c2b40c0ab6be495e9de46f1852b6cf Mon Sep 17 00:00:00 2001
From: kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Mon, 5 Jun 2006 20:46:27 +0000
Subject: use module names, not file names, in menuselect work around XML
 parsing bug in menuselect for default sounds package

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@32407 f38db490-d61c-443f-a65b-d21fe96a405b
---
 res/Makefile   | 12 +++++++-----
 res/res_snmp.c | 10 ----------
 2 files changed, 7 insertions(+), 15 deletions(-)

(limited to 'res')

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
diff --git a/res/res_snmp.c b/res/res_snmp.c
index 39e2cdb36..5fb48d5d4 100644
--- a/res/res_snmp.c
+++ b/res/res_snmp.c
@@ -141,13 +141,3 @@ const char *description(void)
 {
     return MODULE_DESCRIPTION;
 }
-
-/*
- * Local Variables:
- * c-file-style: gnu
- * c-basic-offset: 4
- * c-file-offsets: ((case-label . 0))
- * tab-width: 4
- * indent-tabs-mode: t
- * End:
- */
-- 
cgit v1.2.3