From: Russell Bryant <russell@russellbryant.com>
Date: Mon, 15 Jan 2007 23:51:04 +0000 (+0000)
Subject: Merged revisions 50994 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~3475
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b948cf876cb0dc8ac19617935f0714ffe441de16;p=thirdparty%2Fasterisk.git

Merged revisions 50994 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r50994 | russell | 2007-01-15 17:49:48 -0600 (Mon, 15 Jan 2007) | 2 lines

Filter out a few CFLAGS that are not valid CXXFLAGS.

........


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

diff --git a/Makefile.rules b/Makefile.rules
index c2b6240220..9d20c5a914 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -55,9 +55,9 @@ endif
 %.oo: %.cc
 	$(ECHO_PREFIX) echo "   [CXX] $< -> $@"
 ifeq ($(AST_DEVMODE),yes)
-	$(CMD_PREFIX) $(CXX) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
+	$(CMD_PREFIX) $(CXX) -o $@ -c $< $(PTHREAD_CFLAGS) $(filter-out -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations,$(ASTCFLAGS)) -MMD -MT $@ -MF .$(subst /,_,$@).d -MP
 else
-	$(CMD_PREFIX) $(CXX) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS)
+	$(CMD_PREFIX) $(CXX) -o $@ -c $< $(PTHREAD_CFLAGS) $(filter-out -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations,$(ASTCFLAGS))
 endif
 
 %.c: %.y