From: Kevin P. Fleming Date: Wed, 2 Jan 2008 14:50:46 +0000 (+0000) Subject: use the proper technique for including submodules so that embedding will work X-Git-Tag: 1.6.0-beta1~3^2~227 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=005cb3329c875810266b3e401e5ec0860a2fbc4c;p=thirdparty%2Fasterisk.git use the proper technique for including submodules so that embedding will work git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@95840 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/Makefile b/channels/Makefile index 1afeebfc99..d2227fbc7d 100644 --- a/channels/Makefile +++ b/channels/Makefile @@ -51,8 +51,6 @@ endif all: _all -chan_oss.so: console_video.o vgrabbers.o - include $(ASTTOPDIR)/Makefile.moddir_rules ifneq ($(findstring $(OSARCH), mingw32 cygwin ),) @@ -121,3 +119,5 @@ misdn/isdn_lib.o: ASTCFLAGS+=-Wno-strict-aliasing $(if $(filter chan_misdn,$(EMBEDDED_MODS)),modules.link,chan_misdn.so): chan_misdn.o misdn_config.o misdn/isdn_lib.o misdn/isdn_msg_parser.o chan_vpb.oo: ASTCFLAGS:=$(filter-out -Wdeclaration-after-statement,$(ASTCFLAGS)) + +$(if $(filter chan_oss,$(EMBEDDED_MODS)),modules.link,chan_oss.so): console_video.o vgrabbers.o