kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

more Makefile cleanup and consistency stuff

Browse Source 
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
This commit is contained in:
Kevin P. Fleming
2006-07-15 19:59:35 +00:00
parent 396ef6f9e7
commit 000ba592b2
10 changed files with 54 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
channels/Makefile
View File

@@ -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