From: Nicholas Nethercote <njn@valgrind.org>
Date: Mon, 9 Feb 2009 01:52:55 +0000 (+0000)
Subject: Makefile.flags.am
X-Git-Tag: svn/VALGRIND_3_5_0~1012
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0b2d7857937e7b403fa3a6d677e9982691a7b9be;p=thirdparty%2Fvalgrind.git

Makefile.flags.am
    Remove mentions of empty variables.

Makefile.am
    Only install default.supp;  other .supp files aren't necessary to
    install.


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

diff --git a/Makefile.am b/Makefile.am
index 8353e539be..ccc13829e2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -100,9 +100,8 @@ install-exec-hook:
 
 all-local: default.supp
 	mkdir -p $(inplacedir)
-	rm -f $(addprefix $(inplacedir)/,default.supp $(SUPP_FILES))
+	rm -f $(inplacedir)/default.supp
 	ln -s ../default.supp $(inplacedir)
-	ln -s $(addprefix ../$(top_srcdir)/,$(SUPP_FILES)) $(inplacedir)
 
 distclean-local:
 	rm -rf $(inplacedir)
diff --git a/Makefile.flags.am b/Makefile.flags.am
index 244243dd00..58fce800c2 100644
--- a/Makefile.flags.am
+++ b/Makefile.flags.am
@@ -26,7 +26,7 @@ AM_CPPFLAGS_X86_LINUX 	  = $(AM_CPPFLAGS_COMMON) \
 			    -DVGP_x86_linux=1
 AM_CFLAGS_X86_LINUX       = $(WERROR) @FLAG_M32@ @PREFERRED_STACK_BOUNDARY@ \
 			 	$(AM_CFLAGS_BASE)
-AM_CCASFLAGS_X86_LINUX    = $(add_includes_x86_linux) @FLAG_M32@ -g
+AM_CCASFLAGS_X86_LINUX    = @FLAG_M32@ -g
 
 AM_FLAG_M3264_AMD64_LINUX = @FLAG_M64@
 AM_CPPFLAGS_AMD64_LINUX   = $(AM_CPPFLAGS_COMMON) \
@@ -35,7 +35,7 @@ AM_CPPFLAGS_AMD64_LINUX   = $(AM_CPPFLAGS_COMMON) \
 			    -DVGP_amd64_linux=1
 AM_CFLAGS_AMD64_LINUX     = $(WERROR) @FLAG_M64@ -fomit-frame-pointer \
 				@PREFERRED_STACK_BOUNDARY@ $(AM_CFLAGS_BASE)
-AM_CCASFLAGS_AMD64_LINUX  = $(add_includes_amd64_linux) @FLAG_M64@ -g
+AM_CCASFLAGS_AMD64_LINUX  = @FLAG_M64@ -g
 
 AM_FLAG_M3264_PPC32_LINUX = @FLAG_M32@
 AM_CPPFLAGS_PPC32_LINUX = $(AM_CPPFLAGS_COMMON) \
@@ -43,7 +43,7 @@ AM_CPPFLAGS_PPC32_LINUX = $(AM_CPPFLAGS_COMMON) \
 		-DVGO_linux=1 \
 		-DVGP_ppc32_linux=1
 AM_CFLAGS_PPC32_LINUX     = $(WERROR) @FLAG_M32@ $(AM_CFLAGS_BASE)
-AM_CCASFLAGS_PPC32_LINUX  = $(add_includes_ppc32_linux) -Wa,-maltivec @FLAG_M32@ -g
+AM_CCASFLAGS_PPC32_LINUX  = @FLAG_M32@ -g
 
 AM_FLAG_M3264_PPC64_LINUX = @FLAG_M64@
 AM_CPPFLAGS_PPC64_LINUX   = $(AM_CPPFLAGS_COMMON) \
@@ -51,7 +51,7 @@ AM_CPPFLAGS_PPC64_LINUX   = $(AM_CPPFLAGS_COMMON) \
 			    -DVGO_linux=1 \
 			    -DVGP_ppc64_linux=1
 AM_CFLAGS_PPC64_LINUX     = $(WERROR) @FLAG_M64@ $(AM_CFLAGS_BASE)
-AM_CCASFLAGS_PPC64_LINUX  = $(add_includes_ppc64_linux) -Wa,-maltivec @FLAG_M64@ -g
+AM_CCASFLAGS_PPC64_LINUX  = @FLAG_M64@ -g
 
 AM_FLAG_M3264_PPC32_AIX5  = @FLAG_MAIX32@
 AM_CPPFLAGS_PPC32_AIX5 	  = $(AM_CPPFLAGS_COMMON) \
@@ -59,8 +59,7 @@ AM_CPPFLAGS_PPC32_AIX5 	  = $(AM_CPPFLAGS_COMMON) \
 			    -DVGO_aix5=1 \
 			    -DVGP_ppc32_aix5=1
 AM_CFLAGS_PPC32_AIX5      = $(WERROR) @FLAG_MAIX32@ -mcpu=powerpc $(AM_CFLAGS_BASE)
-AM_CCASFLAGS_PPC32_AIX5   = $(add_includes_ppc32_aix5) \
-				@FLAG_MAIX32@ -mcpu=powerpc -g
+AM_CCASFLAGS_PPC32_AIX5   = @FLAG_MAIX32@ -mcpu=powerpc -g
 
 AM_FLAG_M3264_PPC64_AIX5  = @FLAG_MAIX64@
 AM_CPPFLAGS_PPC64_AIX5    = $(AM_CPPFLAGS_COMMON) \
@@ -68,8 +67,7 @@ AM_CPPFLAGS_PPC64_AIX5    = $(AM_CPPFLAGS_COMMON) \
 			    -DVGO_aix5=1 \
 			    -DVGP_ppc64_aix5=1
 AM_CFLAGS_PPC64_AIX5      = $(WERROR) @FLAG_MAIX64@ -mcpu=powerpc64 $(AM_CFLAGS_BASE)
-AM_CCASFLAGS_PPC64_AIX5   = $(add_includes_ppc64_aix5) \
-				@FLAG_MAIX64@ -mcpu=powerpc64 -g
+AM_CCASFLAGS_PPC64_AIX5   = @FLAG_MAIX64@ -mcpu=powerpc64 -g
 
 # Flags for the primary target.  These must be used to build the
 # regtests and performance tests.  In fact, these must be used to