From fd1e942f53d67c823a1f99973244353b4eb4450c Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Mon, 17 Dec 2007 07:21:08 +0000 Subject: [PATCH] fix some copy-and-paste leftovers git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@93183 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- cdr/Makefile | 4 ++-- channels/Makefile | 4 ++-- codecs/Makefile | 4 ++-- formats/Makefile | 4 ++-- funcs/Makefile | 4 ++-- pbx/Makefile | 4 ++-- res/Makefile | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cdr/Makefile b/cdr/Makefile index eefeb4e468..b7e854468a 100644 --- a/cdr/Makefile +++ b/cdr/Makefile @@ -17,8 +17,8 @@ MENUSELECT_DESCRIPTION=Call Detail Recording ALL_C_MODS:=$(patsubst %.c,%,$(wildcard cdr_*.c)) ALL_CC_MODS:=$(patsubst %.cc,%,$(wildcard cdr_*.cc)) -C_MODS:=$(filter-out $(MENUSELECT_APPS),$(ALL_C_MODS)) -CC_MODS:=$(filter-out $(MENUSELECT_APPS),$(ALL_CC_MODS)) +C_MODS:=$(filter-out $(MENUSELECT_CDR),$(ALL_C_MODS)) +CC_MODS:=$(filter-out $(MENUSELECT_CDR),$(ALL_CC_MODS)) LOADABLE_MODS:=$(C_MODS) $(CC_MODS) diff --git a/channels/Makefile b/channels/Makefile index b4ae190b75..f5e96c7798 100644 --- a/channels/Makefile +++ b/channels/Makefile @@ -17,8 +17,8 @@ MENUSELECT_DESCRIPTION=Channel Drivers ALL_C_MODS:=$(patsubst %.c,%,$(wildcard chan_*.c)) ALL_CC_MODS:=$(patsubst %.cc,%,$(wildcard chan_*.cc)) -C_MODS:=$(filter-out $(MENUSELECT_APPS),$(ALL_C_MODS)) -CC_MODS:=$(filter-out $(MENUSELECT_APPS),$(ALL_CC_MODS)) +C_MODS:=$(filter-out $(MENUSELECT_CHANNELS),$(ALL_C_MODS)) +CC_MODS:=$(filter-out $(MENUSELECT_CHANNELS),$(ALL_CC_MODS)) ifeq ($(OSARCH),OpenBSD) PTLIB=-lpt_OpenBSD_x86_r diff --git a/codecs/Makefile b/codecs/Makefile index dbf9ecac78..503e7c935f 100644 --- a/codecs/Makefile +++ b/codecs/Makefile @@ -19,8 +19,8 @@ MENUSELECT_DESCRIPTION=Codec Translators ALL_C_MODS:=$(patsubst %.c,%,$(wildcard codec_*.c)) ALL_CC_MODS:=$(patsubst %.cc,%,$(wildcard codec_*.cc)) -C_MODS:=$(filter-out $(MENUSELECT_APPS),$(ALL_C_MODS)) -CC_MODS:=$(filter-out $(MENUSELECT_APPS),$(ALL_CC_MODS)) +C_MODS:=$(filter-out $(MENUSELECT_CODECS),$(ALL_C_MODS)) +CC_MODS:=$(filter-out $(MENUSELECT_CODECS),$(ALL_CC_MODS)) LOADABLE_MODS:=$(C_MODS) $(CC_MODS) diff --git a/formats/Makefile b/formats/Makefile index 18ca615cec..9e77de644e 100644 --- a/formats/Makefile +++ b/formats/Makefile @@ -17,8 +17,8 @@ MENUSELECT_DESCRIPTION=Format Interpreters ALL_C_MODS:=$(patsubst %.c,%,$(wildcard format_*.c)) ALL_CC_MODS:=$(patsubst %.cc,%,$(wildcard format_*.cc)) -C_MODS:=$(filter-out $(MENUSELECT_APPS),$(ALL_C_MODS)) -CC_MODS:=$(filter-out $(MENUSELECT_APPS),$(ALL_CC_MODS)) +C_MODS:=$(filter-out $(MENUSELECT_FORMATS),$(ALL_C_MODS)) +CC_MODS:=$(filter-out $(MENUSELECT_FORMATS),$(ALL_CC_MODS)) LOADABLE_MODS:=$(C_MODS) $(CC_MODS) diff --git a/funcs/Makefile b/funcs/Makefile index ca3c973e0d..7b55e6efb5 100644 --- a/funcs/Makefile +++ b/funcs/Makefile @@ -17,8 +17,8 @@ MENUSELECT_DESCRIPTION=Dialplan Functions ALL_C_MODS:=$(patsubst %.c,%,$(wildcard func_*.c)) ALL_CC_MODS:=$(patsubst %.cc,%,$(wildcard func_*.cc)) -C_MODS:=$(filter-out $(MENUSELECT_APPS),$(ALL_C_MODS)) -CC_MODS:=$(filter-out $(MENUSELECT_APPS),$(ALL_CC_MODS)) +C_MODS:=$(filter-out $(MENUSELECT_FUNCS),$(ALL_C_MODS)) +CC_MODS:=$(filter-out $(MENUSELECT_FUNCS),$(ALL_CC_MODS)) LOADABLE_MODS:=$(C_MODS) $(CC_MODS) diff --git a/pbx/Makefile b/pbx/Makefile index d19a3e2561..acecdccacc 100644 --- a/pbx/Makefile +++ b/pbx/Makefile @@ -17,8 +17,8 @@ MENUSELECT_DESCRIPTION=PBX Modules ALL_C_MODS:=$(patsubst %.c,%,$(wildcard pbx_*.c)) ALL_CC_MODS:=$(patsubst %.cc,%,$(wildcard pbx_*.cc)) -C_MODS:=$(filter-out $(MENUSELECT_APPS),$(ALL_C_MODS)) -CC_MODS:=$(filter-out $(MENUSELECT_APPS),$(ALL_CC_MODS)) +C_MODS:=$(filter-out $(MENUSELECT_PBX),$(ALL_C_MODS)) +CC_MODS:=$(filter-out $(MENUSELECT_PBX),$(ALL_CC_MODS)) LOADABLE_MODS:=$(C_MODS) $(CC_MODS) diff --git a/res/Makefile b/res/Makefile index 6e83aa3583..11fdfa096e 100644 --- a/res/Makefile +++ b/res/Makefile @@ -17,8 +17,8 @@ MENUSELECT_DESCRIPTION=Resource Modules ALL_C_MODS:=$(patsubst %.c,%,$(wildcard res_*.c)) ALL_CC_MODS:=$(patsubst %.cc,%,$(wildcard res_*.cc)) -C_MODS:=$(filter-out $(MENUSELECT_APPS),$(ALL_C_MODS)) -CC_MODS:=$(filter-out $(MENUSELECT_APPS),$(ALL_CC_MODS)) +C_MODS:=$(filter-out $(MENUSELECT_RES),$(ALL_C_MODS)) +CC_MODS:=$(filter-out $(MENUSELECT_RES),$(ALL_CC_MODS)) LOADABLE_MODS:=$(C_MODS) $(CC_MODS)