|
From: <sv...@va...> - 2010-01-03 17:40:21
|
Author: sewardj Date: 2010-01-03 17:40:07 +0000 (Sun, 03 Jan 2010) New Revision: 10998 Log: Try to integrate none/tests/arm properly in the build system. Modified: trunk/none/tests/Makefile.am trunk/none/tests/arm/Makefile.am Modified: trunk/none/tests/Makefile.am =================================================================== --- trunk/none/tests/Makefile.am 2010-01-03 16:10:14 UTC (rev 10997) +++ trunk/none/tests/Makefile.am 2010-01-03 17:40:07 UTC (rev 10998) @@ -16,6 +16,9 @@ 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 @@ 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 \ Modified: trunk/none/tests/arm/Makefile.am =================================================================== --- trunk/none/tests/arm/Makefile.am 2010-01-03 16:10:14 UTC (rev 10997) +++ trunk/none/tests/arm/Makefile.am 2010-01-03 17:40:07 UTC (rev 10998) @@ -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@ |