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: https://origsvn.digium.com/svn/asterisk/trunk@107715 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/Makefile.rules b/Makefile.rules
index ca21dcc04a315fc86f1f53528f5749a8be93f36a..f26e2f7a6ff2c883e99ee30a40297f793f5287f6 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -61,7 +61,7 @@ endif
 
 %.oo: %.cc
        $(ECHO_PREFIX) echo "   [CXX] $< -> $@"
-       $(CMD_PREFIX) $(CXX) -o $@ -c $< $(PTHREAD_CFLAGS) $(filter-out -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations,$(ASTCFLAGS)) $(MAKE_DEPS)
+       $(CMD_PREFIX) $(CXX) -o $@ -c $< $(PTHREAD_CFLAGS) $(filter-out -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(AST_DECLARATION_AFTER_STATEMENT),$(ASTCFLAGS)) $(MAKE_DEPS)
 
 %.c: %.y
        $(ECHO_PREFIX) echo "   [BISON] $< -> $@"

diff --git a/channels/Makefile b/channels/Makefile
index 467fc8031284d0cadd7ba8f2be1150ef42c01393..34bd8e092dc92b2b6fb3d394ee8ac4c7c72580f4 100644 (file)
--- 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