get chan_vpb to build properly in dev mode

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@107713 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/Makefile.rules b/Makefile.rules
index 89c2407626b411383b9582c8bcac6b86ec853343..6e29b4125b0bc5eef8eb200264fff22cdda81536 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -48,7 +48,7 @@ endif
 
 %.oo: %.cc
        $(ECHO_PREFIX) echo "   [CXX] $< -> $@"
-       $(CMD_PREFIX) $(CXX) -o $@ -c $< $(PTHREAD_CFLAGS) $(filter-out -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations,$(ASTCFLAGS)) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
+       $(CMD_PREFIX) $(CXX) -o $@ -c $< $(PTHREAD_CFLAGS) $(filter-out -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(AST_DECLARATION_AFTER_STATEMENT),$(ASTCFLAGS)) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
 
 %.c: %.y
        $(ECHO_PREFIX) echo "   [BISON] $< -> $@"

diff --git a/channels/Makefile b/channels/Makefile
index 9ca05b18bfa65166fa9a8e62faab0289ab7135d4..d46632e01f4144873f53ab507dedb57b53718fb6 100644 (file)
--- a/channels/Makefile
+++ b/channels/Makefile
@@ -125,5 +125,3 @@ misdn/isdn_lib.o: ASTCFLAGS+=-Wno-strict-aliasing
 misdn_config.o misdn/isdn_lib.o misdn/isdn_msg_parser.o: ASTCFLAGS+=$(MENUSELECT_OPTS_chan_misdn:%=-D%) $(foreach dep,$(MENUSELECT_DEPENDS_chan_misdn),$(value $(dep)_INCLUDE))
 
 $(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))