From: Julian Seward <jseward@acm.org>
Date: Wed, 25 Jan 2006 02:58:28 +0000 (+0000)
Subject: Ensure -Wdeclaration-after-statement gets through to vex-land.
X-Git-Tag: svn/VALGRIND_3_2_0~318
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4e98cbd7f511488734ff1932afea2059ff1c950;p=thirdparty%2Fvalgrind.git

Ensure -Wdeclaration-after-statement gets through to vex-land.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@5593
---

diff --git a/Makefile.tool.am b/Makefile.tool.am
index e985aecd54..7c9318e8df 100644
--- a/Makefile.tool.am
+++ b/Makefile.tool.am
@@ -37,16 +37,20 @@ COREGRIND_LIBS_PPC64_LINUX = \
 ##.PHONY:  @VEX_DIR@/libvex.a
 
 @VEX_DIR@/libvex_x86_linux.a: @VEX_DIR@/priv/main/vex_svnversion.h
-	$(MAKE) -C @VEX_DIR@ CC="$(CC)" libvex_x86_linux.a EXTRA_CFLAGS="$(AM_CFLAGS_X86_LINUX)"
+	$(MAKE) -C @VEX_DIR@ CC="$(CC)" libvex_x86_linux.a \
+	EXTRA_CFLAGS="$(AM_CFLAGS_X86_LINUX) @FLAG_WDECL_AFTER_STMT@"
 
 @VEX_DIR@/libvex_amd64_linux.a: @VEX_DIR@/priv/main/vex_svnversion.h
-	$(MAKE) -C @VEX_DIR@ CC="$(CC)" libvex_amd64_linux.a EXTRA_CFLAGS="$(AM_CFLAGS_AMD64_LINUX)"
+	$(MAKE) -C @VEX_DIR@ CC="$(CC)" libvex_amd64_linux.a \
+	EXTRA_CFLAGS="$(AM_CFLAGS_AMD64_LINUX) @FLAG_WDECL_AFTER_STMT@"
 
 @VEX_DIR@/libvex_ppc32_linux.a: @VEX_DIR@/priv/main/vex_svnversion.h
-	$(MAKE) -C @VEX_DIR@ CC="$(CC)" libvex_ppc32_linux.a EXTRA_CFLAGS="$(AM_CFLAGS_PPC32_LINUX)"
+	$(MAKE) -C @VEX_DIR@ CC="$(CC)" libvex_ppc32_linux.a \
+	EXTRA_CFLAGS="$(AM_CFLAGS_PPC32_LINUX) @FLAG_WDECL_AFTER_STMT@"
 
 @VEX_DIR@/libvex_ppc64_linux.a: @VEX_DIR@/priv/main/vex_svnversion.h
-	$(MAKE) -C @VEX_DIR@ CC="$(CC)" libvex_ppc64_linux.a EXTRA_CFLAGS="$(AM_CFLAGS_PPC64_LINUX)"
+	$(MAKE) -C @VEX_DIR@ CC="$(CC)" libvex_ppc64_linux.a \
+	EXTRA_CFLAGS="$(AM_CFLAGS_PPC64_LINUX) @FLAG_WDECL_AFTER_STMT@"
 
 @VEX_DIR@/priv/main/vex_svnversion.h:
 	$(MAKE) -C @VEX_DIR@ CC="$(CC)" version
diff --git a/configure.in b/configure.in
index be46a73ce2..cf78a90d20 100644
--- a/configure.in
+++ b/configure.in
@@ -486,13 +486,17 @@ int main () { return 0 ; }
 ],
 [
 declaration_after_statement=yes
+FLAG_WDECL_AFTER_STMT="-Wdeclaration-after-statement"
 AC_MSG_RESULT([yes])
 ], [
 declaration_after_statement=no
+FLAG_WDECL_AFTER_STMT=""
 AC_MSG_RESULT([no])
 ])
 CFLAGS=$safe_CFLAGS
 
+AC_SUBST(FLAG_WDECL_AFTER_STMT)
+
 if test x$declaration_after_statement = xyes; then
   CFLAGS="$CFLAGS -Wdeclaration-after-statement"
 fi