diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-11 20:51:18 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-11 20:51:18 +0000 |
commit | 7091bb222e24c739d26120b6bb04a6a112325743 (patch) | |
tree | 6a8e92ff6a210389f298bfffcb7442d1ee78d709 /channels/Makefile | |
parent | e4f5db2844b84a7acd8ede330e8572ffa46359d4 (diff) |
Merged revisions 107715 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r107715 | kpfleming | 2008-03-11 15:50:57 -0500 (Tue, 11 Mar 2008) | 10 lines
Merged revisions 107713 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r107713 | kpfleming | 2008-03-11 15:48:58 -0500 (Tue, 11 Mar 2008) | 2 lines
get chan_vpb to build properly in dev mode
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@107716 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/Makefile')
-rw-r--r-- | channels/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/channels/Makefile b/channels/Makefile index 467fc8031..34bd8e092 100644 --- a/channels/Makefile +++ b/channels/Makefile @@ -100,6 +100,4 @@ misdn/isdn_lib.o: ASTCFLAGS+=-Wno-strict-aliasing $(if $(filter chan_misdn,$(EMBEDDED_MODS)),modules.link,chan_misdn.so): 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 console_board.o |