From: Nicholas Nethercote <njn@valgrind.org>
Date: Tue, 2 Jun 2009 04:46:46 +0000 (+0000)
Subject: Avoid repetitive cut+paste code for AM_CPPFLAGS.
X-Git-Tag: svn/VALGRIND_3_5_0~569
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=216e73fe387bcb7e670fb7e7fdf5ab6a7f57bf40;p=thirdparty%2Fvalgrind.git

Avoid repetitive cut+paste code for AM_CPPFLAGS.



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

diff --git a/Makefile.flags.am b/Makefile.flags.am
index f0352b6e03..c723ca3e4c 100644
--- a/Makefile.flags.am
+++ b/Makefile.flags.am
@@ -30,78 +30,56 @@ endif
 # means some of the flags are duplicated on systems with newer versions of
 # automake, but this does not really matter and seems hard to avoid.
 
-AM_CPPFLAGS_COMMON = \
-		-I$(top_srcdir) \
-		-I$(top_srcdir)/include \
-		-I@VEX_DIR@/pub
+AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@ = \
+ 		-I$(top_srcdir)/include \
+		-I@VEX_DIR@/pub \
+		-DVGA_@VGCONF_ARCH_PRI@=1 \
+		-DVGO_@VGCONF_OS@=1 \
+		-DVGP_@VGCONF_ARCH_PRI@_@VGCONF_OS@=1
+if VGCONF_HAVE_PLATFORM_SEC
+AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@ = \
+ 		-I$(top_srcdir)/include \
+		-I@VEX_DIR@/pub \
+		-DVGA_@VGCONF_ARCH_SEC@=1 \
+		-DVGO_@VGCONF_OS@=1 \
+		-DVGP_@VGCONF_ARCH_SEC@_@VGCONF_OS@=1
+endif
 
 AM_FLAG_M3264_X86_LINUX   = @FLAG_M32@
-AM_CPPFLAGS_X86_LINUX 	  = $(AM_CPPFLAGS_COMMON) \
-			    -DVGA_x86=1 \
-			    -DVGO_linux=1 \
-			    -DVGP_x86_linux=1
 AM_CFLAGS_X86_LINUX       = @FLAG_M32@ @PREFERRED_STACK_BOUNDARY@ \
 			 	$(AM_CFLAGS_BASE)
 AM_CCASFLAGS_X86_LINUX    = $(AM_CPPFLAGS_X86_LINUX) @FLAG_M32@ -g
 
 AM_FLAG_M3264_AMD64_LINUX = @FLAG_M64@
-AM_CPPFLAGS_AMD64_LINUX   = $(AM_CPPFLAGS_COMMON) \
-			    -DVGA_amd64=1 \
-			    -DVGO_linux=1 \
-			    -DVGP_amd64_linux=1
 AM_CFLAGS_AMD64_LINUX     = @FLAG_M64@ -fomit-frame-pointer \
 				@PREFERRED_STACK_BOUNDARY@ $(AM_CFLAGS_BASE)
 AM_CCASFLAGS_AMD64_LINUX  = $(AM_CPPFLAGS_AMD64_LINUX) @FLAG_M64@ -g
 
 AM_FLAG_M3264_PPC32_LINUX = @FLAG_M32@
-AM_CPPFLAGS_PPC32_LINUX = $(AM_CPPFLAGS_COMMON) \
-		-DVGA_ppc32=1 \
-		-DVGO_linux=1 \
-		-DVGP_ppc32_linux=1
 AM_CFLAGS_PPC32_LINUX     = @FLAG_M32@ $(AM_CFLAGS_BASE)
 AM_CCASFLAGS_PPC32_LINUX  = $(AM_CPPFLAGS_PPC32_LINUX) @FLAG_M32@ -g
 
 AM_FLAG_M3264_PPC64_LINUX = @FLAG_M64@
-AM_CPPFLAGS_PPC64_LINUX   = $(AM_CPPFLAGS_COMMON) \
-			    -DVGA_ppc64=1 \
-			    -DVGO_linux=1 \
-			    -DVGP_ppc64_linux=1
 AM_CFLAGS_PPC64_LINUX     = @FLAG_M64@ $(AM_CFLAGS_BASE)
 AM_CCASFLAGS_PPC64_LINUX  = $(AM_CPPFLAGS_PPC64_LINUX) @FLAG_M64@ -g
 
 AM_FLAG_M3264_PPC32_AIX5  = @FLAG_MAIX32@
-AM_CPPFLAGS_PPC32_AIX5 	  = $(AM_CPPFLAGS_COMMON) \
-			    -DVGA_ppc32=1 \
-			    -DVGO_aix5=1 \
-			    -DVGP_ppc32_aix5=1
 AM_CFLAGS_PPC32_AIX5      = @FLAG_MAIX32@ -mcpu=powerpc $(AM_CFLAGS_BASE)
 AM_CCASFLAGS_PPC32_AIX5   = $(AM_CPPFLAGS_PPC32_AIX5) \
 			    @FLAG_MAIX32@ -mcpu=powerpc -g
 
 AM_FLAG_M3264_PPC64_AIX5  = @FLAG_MAIX64@
-AM_CPPFLAGS_PPC64_AIX5    = $(AM_CPPFLAGS_COMMON) \
-			    -DVGA_ppc64=1 \
-			    -DVGO_aix5=1 \
-			    -DVGP_ppc64_aix5=1
 AM_CFLAGS_PPC64_AIX5      = @FLAG_MAIX64@ -mcpu=powerpc64 $(AM_CFLAGS_BASE)
 AM_CCASFLAGS_PPC64_AIX5   = $(AM_CPPFLAGS_PPC64_AIX5) \
 			    @FLAG_MAIX64@ -mcpu=powerpc64 -g
 
 AM_FLAG_M3264_X86_DARWIN = -arch i386
-AM_CPPFLAGS_X86_DARWIN	  = $(AM_CPPFLAGS_COMMON) \
-			    -DVGA_x86=1 \
-			    -DVGO_darwin=1 \
-			    -DVGP_x86_darwin=1
 AM_CFLAGS_X86_DARWIN     = $(WERROR) -arch i386 $(AM_CFLAGS_BASE) \
 			    -mmacosx-version-min=10.5 -fno-stack-protector \
 			    -mdynamic-no-pic
 AM_CCASFLAGS_X86_DARWIN  = $(AM_CPPFLAGS_X86_DARWIN) -arch i386 -g
 
 AM_FLAG_M3264_AMD64_DARWIN = -arch x86_64
-AM_CPPFLAGS_AMD64_DARWIN  = $(AM_CPPFLAGS_COMMON) \
-			    -DVGA_amd64=1 \
-			    -DVGO_darwin=1 \
-			    -DVGP_amd64_darwin=1
 AM_CFLAGS_AMD64_DARWIN     = $(WERROR) -arch x86_64 $(AM_CFLAGS_BASE) \
 			    -mmacosx-version-min=10.5 -fno-stack-protector
 AM_CCASFLAGS_AMD64_DARWIN  = $(AM_CPPFLAGS_AMD64_DARWIN) -arch x86_64 -g
diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index 1bcfec7ff8..1d08c36d43 100644
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -7,33 +7,16 @@ include $(top_srcdir)/Makefile.all.am
 include $(top_srcdir)/Makefile.flags.am
 include $(top_srcdir)/Makefile.core-tool.am
 
-AM_CPPFLAGS_CORE_COMMON = \
-	-I$(top_srcdir)/coregrind \
-	-DVG_LIBDIR="\"$(valdir)"\"
-
-AM_CPPFLAGS_X86_LINUX   += \
-    $(AM_CPPFLAGS_CORE_COMMON) -DVG_PLATFORM="\"x86-linux\""
-
-AM_CPPFLAGS_AMD64_LINUX += \
-    $(AM_CPPFLAGS_CORE_COMMON) -DVG_PLATFORM="\"amd64-linux\""
-
-AM_CPPFLAGS_PPC32_LINUX += \
-    $(AM_CPPFLAGS_CORE_COMMON) -DVG_PLATFORM="\"ppc32-linux\""
-
-AM_CPPFLAGS_PPC64_LINUX += \
-    $(AM_CPPFLAGS_CORE_COMMON) -DVG_PLATFORM="\"ppc64-linux\""
-
-AM_CPPFLAGS_PPC32_AIX5  += \
-    $(AM_CPPFLAGS_CORE_COMMON) -DVG_PLATFORM="\"ppc32-aix5\""
-
-AM_CPPFLAGS_PPC64_AIX5  += \
-    $(AM_CPPFLAGS_CORE_COMMON) -DVG_PLATFORM="\"ppc64-aix5\""
-
-AM_CPPFLAGS_X86_DARWIN   += \
-    $(AM_CPPFLAGS_CORE_COMMON) -DVG_PLATFORM="\"x86-darwin\""
-
-AM_CPPFLAGS_AMD64_DARWIN += \
-    $(AM_CPPFLAGS_CORE_COMMON) -DVG_PLATFORM="\"amd64-darwin\""
+AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@ += \
+ 	-I$(top_srcdir)/coregrind \
+	-DVG_LIBDIR="\"$(valdir)"\" \
+	-DVG_PLATFORM="\"@VGCONF_ARCH_PRI@-@VGCONF_OS@\""
+if VGCONF_HAVE_PLATFORM_SEC
+AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@ += \
+ 	-I$(top_srcdir)/coregrind \
+	-DVG_LIBDIR="\"$(valdir)"\" \
+	-DVG_PLATFORM="\"@VGCONF_ARCH_SEC@-@VGCONF_OS@\""
+endif
 
 
 default.supp: $(SUPP_FILES)