From e6e6bf27bb632e6ac64e21a1383019ee6832b59b Mon Sep 17 00:00:00 2001
From: Julian Seward <jseward@acm.org>
Date: Sun, 3 Jan 2010 17:40:07 +0000
Subject: [PATCH] Try to integrate none/tests/arm properly in the build system.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10998
---
 none/tests/Makefile.am     |  5 ++++-
 none/tests/arm/Makefile.am | 17 +++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/none/tests/Makefile.am b/none/tests/Makefile.am
index 1ada7964c3..730d3a29bd 100644
--- a/none/tests/Makefile.am
+++ b/none/tests/Makefile.am
@@ -16,6 +16,9 @@ endif
 if VGCONF_ARCHS_INCLUDE_PPC64
 SUBDIRS += ppc64
 endif
+if VGCONF_ARCHS_INCLUDE_ARM
+SUBDIRS += arm
+endif
 
 # OS-specific tests
 if VGCONF_OS_IS_LINUX
@@ -30,7 +33,7 @@ if VGCONF_PLATFORMS_INCLUDE_X86_LINUX
 SUBDIRS += x86-linux
 endif
 
-DIST_SUBDIRS = x86 amd64 ppc32 ppc64 linux darwin x86-linux .
+DIST_SUBDIRS = x86 amd64 ppc32 ppc64 arm linux darwin x86-linux .
 
 dist_noinst_SCRIPTS = \
 	filter_cmdline0 \
diff --git a/none/tests/arm/Makefile.am b/none/tests/arm/Makefile.am
index d9ff4b343d..de7a4bc71d 100644
--- a/none/tests/arm/Makefile.am
+++ b/none/tests/arm/Makefile.am
@@ -1,16 +1,17 @@
 
 ### jrs: re-check this against known-good equivalents, eg x86 version
 
-EXTRA_DIST = $(noinst_SCRIPTS) \
-	instructions.stderr.exp instructions.stdout.exp
+EXTRA_DIST = $(noinst_SCRIPTS)
+#	\
+#	instructions.stderr.exp instructions.stdout.exp
+
 # if any tests appear here, remember to include @FLAG_M32@ in the
 # compilation flags
 #
 
-check_PROGRAMS = instructions
+#check_PROGRAMS = instructions
+check_PROGRAMS =
 
-AM_CFLAGS    = $(WERROR) -Winline -Wall -Wshadow \
-		@FLAG_M32@ -g -I$(top_srcdir)/include \
-		$(FLAG_MMMX) $(FLAG_MSSE)
-AM_CXXFLAGS  = $(AM_CFLAGS)
-AM_CCASFLAGS = @FLAG_M32@
+AM_CFLAGS    += @FLAG_M32@
+AM_CXXFLAGS  += @FLAG_M32@
+AM_CCASFLAGS += @FLAG_M32@
-- 
2.47.2