aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2008-03-11 20:48:58 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2008-03-11 20:48:58 +0000
commitca1afdfb1f6c072729230b4fd46eba32c0adae2f (patch)
treeb7191a609712d9ec633a44399c1b30a52d8218b3
parent7dd677441285e1fac59206eaf3e389dafd8e9e7b (diff)
get chan_vpb to build properly in dev mode
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@107713 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--Makefile.rules2
-rw-r--r--channels/Makefile2
2 files changed, 1 insertions, 3 deletions
diff --git a/Makefile.rules b/Makefile.rules
index 89c240762..6e29b4125 100644
--- 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 9ca05b18b..d46632e01 100644
--- 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))