diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-01-02 14:50:46 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-01-02 14:50:46 +0000 |
| commit | 392b2695ddfd2b3272031e151fc7352fdf9f61c9 (patch) | |
| tree | 189150fa8d23f84a0fe0cb84352c09f01b7fbf90 /channels/Makefile | |
| parent | 16a0b3a8a62d0161f0e8f6fd5780d1f41c024836 (diff) | |
use the proper technique for including submodules so that embedding will work
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@95840 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/Makefile')
| -rw-r--r-- | channels/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/Makefile b/channels/Makefile index 1afeebfc9..d2227fbc7 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 |