[asterisk-commits] kpfleming: branch 1.6.0 r107716 - in /branches/1.6.0: ./ channels/

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Tue Mar 11 15:51:18 2008
New Revision: 107716

URL: http://svn.digium.com/view/asterisk?view=rev&rev=107716
Log:
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

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/Makefile.rules
    branches/1.6.0/channels/Makefile

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/Makefile.rules
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/Makefile.rules?view=diff&rev=107716&r1=107715&r2=107716
==============================================================================
--- branches/1.6.0/Makefile.rules (original)
+++ branches/1.6.0/Makefile.rules Tue Mar 11 15:51:18 2008
@@ -61,7 +61,7 @@
 
 %.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] $< -> $@"

Modified: branches/1.6.0/channels/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/Makefile?view=diff&rev=107716&r1=107715&r2=107716
==============================================================================
--- branches/1.6.0/channels/Makefile (original)
+++ branches/1.6.0/channels/Makefile Tue Mar 11 15:51:18 2008
@@ -100,6 +100,4 @@
 
 $(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