|
From: <sv...@va...> - 2009-02-09 02:59:52
|
Author: njn Date: 2009-02-09 02:59:48 +0000 (Mon, 09 Feb 2009) New Revision: 9124 Log: Merge r9123 (kill dead variables, don't install unnecessary .supp files) from trunk. Modified: branches/DARWIN/Makefile.am branches/DARWIN/Makefile.flags.am Modified: branches/DARWIN/Makefile.am =================================================================== --- branches/DARWIN/Makefile.am 2009-02-09 01:52:55 UTC (rev 9123) +++ branches/DARWIN/Makefile.am 2009-02-09 02:59:48 UTC (rev 9124) @@ -104,9 +104,8 @@ 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) Modified: branches/DARWIN/Makefile.flags.am =================================================================== --- branches/DARWIN/Makefile.flags.am 2009-02-09 01:52:55 UTC (rev 9123) +++ branches/DARWIN/Makefile.flags.am 2009-02-09 02:59:48 UTC (rev 9124) @@ -32,7 +32,7 @@ -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) \ @@ -41,7 +41,7 @@ -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) \ @@ -49,7 +49,7 @@ -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) \ @@ -57,7 +57,7 @@ -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) \ @@ -65,8 +65,7 @@ -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) \ @@ -74,8 +73,7 @@ -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 AM_FLAG_M3264_X86_DARWIN = -arch i386 AM_CPPFLAGS_X86_DARWIN = $(AM_CPPFLAGS_COMMON) \ |