diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2006-07-15 19:59:35 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2006-07-15 19:59:35 +0000 |
| commit | 000ba592b2475507c0c5a655f3eac2daf93d2fe0 (patch) | |
| tree | a1180a16189aab888f84a1b9b87536d5bcf2dfa1 /channels/Makefile | |
| parent | 396ef6f9e7447e443c7dcd491a7ae47eff0e9877 (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: https://origsvn.digium.com/svn/asterisk/trunk@37661 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/Makefile')
| -rw-r--r-- | channels/Makefile | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/channels/Makefile b/channels/Makefile index 55fa4ae47..d7bf9ac30 100644 --- a/channels/Makefile +++ b/channels/Makefile @@ -14,9 +14,8 @@ ifneq ($(wildcard ../menuselect.makeopts),) include ../menuselect.makedeps endif -SELECTED_MODS:=$(filter-out $(MENUSELECT_CHANNELS),$(patsubst %.c,%,$(wildcard chan_*.c)) $(patsubst %.cc,%,$(wildcard chan_*.cc))) - -CC_MODS=chan_vpb +C_MODS:=$(filter-out $(MENUSELECT_CHANNELS),$(patsubst %.c,%,$(wildcard chan_*.c))) +CC_MODS:=$(filter-out $(MENUSELECT_CHANNELS),$(patsubst %.cc,%,$(wildcard chan_*.cc))) ifeq ($(OSARCH),OpenBSD) PTLIB=-lpt_OpenBSD_x86_r @@ -41,11 +40,11 @@ ifeq ($(OSARCH),NetBSD) endif ifeq ($(wildcard h323/libchanh323.a),) - SELECTED_MODS:=$(filter-out chan_h323,$(SELECTED_MODS)) + CC_MODS:=$(filter-out chan_h323,$(CC_MODS)) endif ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/mISDNuser/mISDNlib.h),) - SELECTED_MODS:=$(filter-out chan_misdn,$(SELECTED_MODS)) + C_MODS:=$(filter-out chan_misdn,$(C_MODS)) endif ifndef OPENH323DIR @@ -56,6 +55,8 @@ ifndef PWLIBDIR PWLIBDIR=$(HOME)/pwlib endif +SELECTED_MODS:=$(C_MODS) $(CC_MODS) + all: _all include $(ASTTOPDIR)/Makefile.moddir_rules |