Fix "make distcheck", and also make sure that the generated archive

contains everything needed to "make regtest".  Bump the version.

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

diff --git a/Makefile.am b/Makefile.am
index 6e3798d00a4f15245f910b07a990a1bde450053a..6273db293d0cf8eeb8de778b0b6a4d2e127a40b5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -51,7 +51,7 @@ install-exec-hook:
        $(LN_S) libpthread.so $(DESTDIR)$(valdir)/libpthread.so.0
 
 all-local:
-       mkdir -p .in_place
-       rm -f $(addprefix .in_place/,default.supp $(SUPP_FILES))
-       ln -s $(addprefix ../,default.supp $(SUPP_FILES)) $(top_srcdir)/.in_place
+       mkdir -p $(top_builddir)/.in_place
+       rm -f $(addprefix $(top_builddir)/.in_place/,default.supp $(SUPP_FILES))
+       ln -s $(addprefix $(top_srcdir)/../,default.supp $(SUPP_FILES)) $(top_builddir)/.in_place
 

diff --git a/addrcheck/Makefile.am b/addrcheck/Makefile.am
index b2e5394f1046a8c6f89dccb7910d03e351822670..4c12457566f6660cacb11c8ef9dd462cf1158a0f 100644 (file)
--- a/addrcheck/Makefile.am
+++ b/addrcheck/Makefile.am
@@ -8,7 +8,7 @@ AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \
                @PREFERRED_STACK_BOUNDARY@ -g
 
 valdir = $(libdir)/valgrind
-inplacedir = $(top_srcdir)/.in_place
+inplacedir = $(top_builddir)/.in_place
 
 val_PROGRAMS = vgskin_addrcheck.so vgpreload_addrcheck.so
 
@@ -21,11 +21,11 @@ vgskin_addrcheck_so_LDADD = \
        ../memcheck/mac_replace_strmem.o
 
 vgpreload_addrcheck_so_SOURCES = 
-vgpreload_addrcheck_so_LDADD = $(top_srcdir)/coregrind/vg_replace_malloc.o
-vgpreload_addrcheck_so_DEPENDENCIES = $(top_srcdir)/coregrind/vg_replace_malloc.o
+vgpreload_addrcheck_so_LDADD = $(top_builddir)/coregrind/vg_replace_malloc.o
+vgpreload_addrcheck_so_DEPENDENCIES = $(top_builddir)/coregrind/vg_replace_malloc.o
 vgpreload_addrcheck_so_LDFLAGS = -shared -Wl,-z,interpose,-z,initfirst
 
 all-local:
        mkdir -p $(inplacedir)
        -rm -f $(addprefix $(inplacedir)/,$(val_PROGRAMS))
-       ln -f -s $(addprefix $(top_srcdir)/$(subdir)/,$(val_PROGRAMS)) $(inplacedir)
+       ln -f -s $(addprefix $(top_builddir)/$(subdir)/,$(val_PROGRAMS)) $(inplacedir)

diff --git a/addrcheck/tests/Makefile.am b/addrcheck/tests/Makefile.am
index 0b4986f95a7987df30510dd359b0163fba6ad00d..60875008fd33f0bdc6076444047f88e5a55851ff 100644 (file)
--- a/addrcheck/tests/Makefile.am
+++ b/addrcheck/tests/Makefile.am
@@ -1,7 +1,11 @@
 noinst_SCRIPTS = filter_stderr
 
+INSN_TESTS=insn_basic insn_cmov insn_mmx insn_mmxext insn_sse insn_sse2
+
 EXTRA_DIST = $(noinst_SCRIPTS) \
        badrw.stderr.exp badrw.vgtest \
        fprw.stderr.exp fprw.vgtest \
        insn_basic.vgtest insn_cmov.vgtest insn_mmx.vgtest \
-       insn_mmxext.vgtest insn_sse.vgtest insn_sse2.vgtest
+       $(addsuffix .stderr.exp,$(INSN_TESTS)) \
+       $(addsuffix .stdout.exp,$(INSN_TESTS)) \
+       $(addsuffix .vgtest,$(INSN_TESTS))

diff --git a/cachegrind/Makefile.am b/cachegrind/Makefile.am
index 0d63a57596944d03688cdf26600ce0fd4614bea9..a00235e24a55de7e61ca4b73c38269198c279425 100644 (file)
--- a/cachegrind/Makefile.am
+++ b/cachegrind/Makefile.am
@@ -6,7 +6,7 @@ AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \
                @PREFERRED_STACK_BOUNDARY@ -g
 
 valdir = $(libdir)/valgrind
-inplacedir = $(top_srcdir)/.in_place
+inplacedir = $(top_builddir)/.in_place
 
 bin_SCRIPTS = cg_annotate
 
@@ -20,4 +20,4 @@ vgskin_cachegrind_so_LDFLAGS = -shared
 all-local:
        mkdir -p $(inplacedir)
        -rm -f $(inplacedir)/$(val_PROGRAMS)
-       ln -f -s $(top_srcdir)/$(subdir)/$(val_PROGRAMS) $(inplacedir)/$(val_PROGRAMS)
+       ln -f -s $(top_builddir)/$(subdir)/$(val_PROGRAMS) $(inplacedir)/$(val_PROGRAMS)

diff --git a/cachegrind/tests/Makefile.am b/cachegrind/tests/Makefile.am
index c0945ea6e68a80f9ead436fef708f3f9e43705ca..1416a9601375681dd81cdcf44976d596474d4c03 100644 (file)
--- a/cachegrind/tests/Makefile.am
+++ b/cachegrind/tests/Makefile.am
@@ -1,11 +1,14 @@
 noinst_SCRIPTS = filter_stderr filter_cachesim_discards
 
+INSN_TESTS=insn_basic insn_cmov insn_mmx insn_mmxext insn_sse insn_sse2
+
 EXTRA_DIST = $(noinst_SCRIPTS) \
        chdir.vgtest chdir.stderr.exp \
        dlclose.vgtest dlclose.stderr.exp dlclose.stdout.exp \
        fpu-28-108.vgtest fpu-28-108.stderr.exp \
-       insn_basic.vgtest insn_cmov.vgtest insn_mmx.vgtest \
-       insn_mmxext.vgtest insn_sse.vgtest insn_sse2.vgtest
+       $(addsuffix .stderr.exp,$(INSN_TESTS)) \
+       $(addsuffix .stdout.exp,$(INSN_TESTS)) \
+       $(addsuffix .vgtest,$(INSN_TESTS))
 
 check_PROGRAMS = \
        chdir dlclose fpu-28-108 myprint.so

diff --git a/configure.in b/configure.in
index 00c9d53ed727f448362420b30051d136d73e5437..f2a58b30d31cb2133ec31e1332814f7dee7ad5e5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 AC_INIT(coregrind/vg_main.c)   # give me a source file, any source file...
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(valgrind, 2.1.0)
+AM_INIT_AUTOMAKE(valgrind, 2.1.1)
 
 AM_MAINTAINER_MODE
 
@@ -357,9 +357,6 @@ AC_OUTPUT(
    include/Makefile 
    auxprogs/Makefile
    coregrind/Makefile 
-   coregrind/arch/Makefile
-   coregrind/arch/x86-linux/Makefile
-   coregrind/arch/x86-freebsd/Makefile
    coregrind/demangle/Makefile 
    coregrind/docs/Makefile
    coregrind/x86/Makefile

diff --git a/corecheck/Makefile.am b/corecheck/Makefile.am
index 56b24941071ba886a4ada1be613d8f23d02a7f77..b1682cc16ad220fd156f70b70279f2ff87c2e572 100644 (file)
--- a/corecheck/Makefile.am
+++ b/corecheck/Makefile.am
@@ -6,7 +6,7 @@ AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \
                @PREFERRED_STACK_BOUNDARY@ -g
 
 valdir = $(libdir)/valgrind
-inplacedir = $(top_srcdir)/.in_place
+inplacedir = $(top_builddir)/.in_place
 
 val_PROGRAMS = vgskin_corecheck.so
 
@@ -16,4 +16,4 @@ vgskin_corecheck_so_LDFLAGS = -shared
 all-local:
        mkdir -p $(inplacedir)
        -rm -f $(inplacedir)/$(val_PROGRAMS)
-       ln -f -s $(top_srcdir)/$(subdir)/$(val_PROGRAMS) $(inplacedir)/$(val_PROGRAMS)
+       ln -f -s $(top_builddir)/$(subdir)/$(val_PROGRAMS) $(inplacedir)/$(val_PROGRAMS)

diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index bed2567d0b69a4bad939216e4c73d028a255741b..157eea9da8786883b6b678e38f7c866fa8705037 100644 (file)
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -1,10 +1,10 @@
 
-SUBDIRS = arch x86 demangle . docs
+SUBDIRS = x86 demangle . docs
 
 add_includes = -I$(srcdir)/demangle -I$(top_srcdir)/include -I$(srcdir)/x86
 
 valdir = $(libdir)/valgrind
-inplacedir = $(top_srcdir)/.in_place
+inplacedir = $(top_builddir)/.in_place
 
 AM_CPPFLAGS = $(add_includes) -DVG_LIBDIR="\"$(valdir)"\"
 AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fno-omit-frame-pointer \
@@ -76,10 +76,10 @@ stage2_SOURCES = \
        vg_translate.c \
        vg_transtab.c \
        vg_ldt.c
-stage2_DEPENDENCIES = $(srcdir)/valgrind.vs $(srcdir)/x86/stage2.lds
+stage2_DEPENDENCIES = $(srcdir)/valgrind.vs x86/stage2.lds
 stage2_LDFLAGS=-Wl,--export-dynamic -Wl,-e,_ume_entry  -g \
        -Wl,-defsym,kickstart_base=0xb8000000 \
-       -Wl,-T,$(srcdir)/x86/stage2.lds \
+       -Wl,-T,x86/stage2.lds \
        -Wl,-version-script $(srcdir)/valgrind.vs 
 stage2_LDADD= \
        demangle/cp-demangle.o \
@@ -144,6 +144,6 @@ all-local:
        for i in $(val_PROGRAMS); do \
                to=$(inplacedir)/$$(echo $$i | sed 's,libpthread.so,libpthread.so.0,'); \
                rm -f $$$to; \
-               ln -sf $(top_srcdir)/$(subdir)/$$i $$to; \
+               ln -sf $(top_builddir)/$(subdir)/$$i $$to; \
        done
 

diff --git a/example/Makefile.am b/example/Makefile.am
index a150e71329640981e2ca53f7ac59e7b4ec302548..3e800d3f4db932adecf0d6015e80a15492fe58e3 100644 (file)
--- a/example/Makefile.am
+++ b/example/Makefile.am
@@ -6,7 +6,7 @@ AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \
                @PREFERRED_STACK_BOUNDARY@ -g
 
 valdir = $(libdir)/valgrind
-inplacedir = $(top_srcdir)/.in_place
+inplacedir = $(top_builddir)/.in_place
 
 val_PROGRAMS = vgskin_example.so
 
@@ -16,5 +16,5 @@ vgskin_example_so_LDFLAGS = -shared
 all-local:
        mkdir -p $(inplacedir)
        -rm -f $(addprefix $(inplacedir)/,$(val_PROGRAMS))
-       ln -f -s $(addprefix $(top_srcdir)/$(subdir)/,$(val_PROGRAMS)) $(inplacedir)
+       ln -f -s $(addprefix $(top_builddir)/$(subdir)/,$(val_PROGRAMS)) $(inplacedir)
 

diff --git a/helgrind/Makefile.am b/helgrind/Makefile.am
index cc7bc156bf4131e6149075f6a49e9c65e3bbce60..eab751501b9c7f780c8df4dd0bdf4b1eef24c14b 100644 (file)
--- a/helgrind/Makefile.am
+++ b/helgrind/Makefile.am
@@ -6,7 +6,7 @@ AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \
                @PREFERRED_STACK_BOUNDARY@ -g
 
 valdir = $(libdir)/valgrind
-inplacedir = $(top_srcdir)/.in_place
+inplacedir = $(top_builddir)/.in_place
 
 val_PROGRAMS = vgskin_helgrind.so vgpreload_helgrind.so
 
@@ -14,8 +14,8 @@ vgskin_helgrind_so_SOURCES = hg_main.c
 vgskin_helgrind_so_LDFLAGS = -shared
 
 vgpreload_helgrind_so_SOURCES = 
-vgpreload_helgrind_so_LDADD = $(top_srcdir)/coregrind/vg_replace_malloc.o
-vgpreload_helgrind_so_DEPENDENCIES = $(top_srcdir)/coregrind/vg_replace_malloc.o
+vgpreload_helgrind_so_LDADD = $(top_builddir)/coregrind/vg_replace_malloc.o
+vgpreload_helgrind_so_DEPENDENCIES = $(top_builddir)/coregrind/vg_replace_malloc.o
 vgpreload_helgrind_so_LDFLAGS = -shared -Wl,-z,interpose,-z,initfirst
 
 hgincludedir = $(includedir)/valgrind
@@ -25,4 +25,4 @@ hginclude_HEADERS = helgrind.h
 all-local:
        mkdir -p $(inplacedir)
        -rm -f $(addprefix $(inplacedir)/,$(val_PROGRAMS))
-       ln -f -s $(addprefix $(top_srcdir)/$(subdir)/,$(val_PROGRAMS)) $(inplacedir)
+       ln -f -s $(addprefix $(top_builddir)/$(subdir)/,$(val_PROGRAMS)) $(inplacedir)

diff --git a/helgrind/tests/Makefile.am b/helgrind/tests/Makefile.am
index c4f478ac32a4d8daa6b8f47a703b7e01294e68cc..8b18796a1d1fbcb9bf50659cfc4b38d89aced36b 100644 (file)
--- a/helgrind/tests/Makefile.am
+++ b/helgrind/tests/Makefile.am
@@ -1,11 +1,14 @@
 noinst_SCRIPTS = filter_stderr
 
+INSN_TESTS=insn_basic insn_cmov insn_mmx insn_mmxext insn_sse insn_sse2
+
 EXTRA_DIST = $(noinst_SCRIPTS) \
        allok.stderr.exp allok.vgtest           \
        deadlock.stderr.exp deadlock.vgtest     \
        inherit.stderr.exp inherit.vgtest       \
-       insn_basic.vgtest insn_cmov.vgtest insn_mmx.vgtest \
-       insn_mmxext.vgtest insn_sse.vgtest insn_sse2.vgtest \
+       $(addsuffix .stderr.exp,$(INSN_TESTS)) \
+       $(addsuffix .stdout.exp,$(INSN_TESTS)) \
+       $(addsuffix .vgtest,$(INSN_TESTS)) \
        race.stderr.exp race.vgtest             \
        race2.stderr.exp race2.vgtest           \
        readshared.stderr.exp readshared.vgtest

diff --git a/lackey/Makefile.am b/lackey/Makefile.am
index 19061616a6729dfae6ddb190213fa70fa90bf894..fdadc30e40429cbcf2fee55213d5b35fc9b59635 100644 (file)
--- a/lackey/Makefile.am
+++ b/lackey/Makefile.am
@@ -6,7 +6,7 @@ AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \
                @PREFERRED_STACK_BOUNDARY@ -g
 
 valdir = $(libdir)/valgrind
-inplacedir = $(top_srcdir)/.in_place
+inplacedir = $(top_builddir)/.in_place
 
 val_PROGRAMS = vgskin_lackey.so
 
@@ -17,4 +17,4 @@ vgskin_lackey_so_LDFLAGS = -shared
 all-local:
        mkdir -p $(inplacedir)
        -rm -f $(inplacedir)/$(val_PROGRAMS)
-       ln -f -s $(top_srcdir)/$(subdir)/$(val_PROGRAMS) $(inplacedir)/$(val_PROGRAMS)
+       ln -f -s $(top_builddir)/$(subdir)/$(val_PROGRAMS) $(inplacedir)/$(val_PROGRAMS)

diff --git a/massif/Makefile.am b/massif/Makefile.am
index 27ceaae1bdc3579af8fe29693301b04a497f3bb0..7e1ce6b1871f03d5d548ad65ab3ef3829b9e8a98 100644 (file)
--- a/massif/Makefile.am
+++ b/massif/Makefile.am
@@ -6,7 +6,7 @@ AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \
                @PREFERRED_STACK_BOUNDARY@ -g
 
 valdir = $(libdir)/valgrind
-inplacedir = $(top_srcdir)/.in_place
+inplacedir = $(top_builddir)/.in_place
 
 val_PROGRAMS = vgskin_massif.so vgpreload_massif.so
 
@@ -14,11 +14,11 @@ vgskin_massif_so_SOURCES = ms_main.c
 vgskin_massif_so_LDFLAGS = -shared
 
 vgpreload_massif_so_SOURCES = 
-vgpreload_massif_so_LDADD = $(top_srcdir)/coregrind/vg_replace_malloc.o
-vgpreload_massif_so_DEPENDENCIES = $(top_srcdir)/coregrind/vg_replace_malloc.o
+vgpreload_massif_so_LDADD = $(top_builddir)/coregrind/vg_replace_malloc.o
+vgpreload_massif_so_DEPENDENCIES = $(top_builddir)/coregrind/vg_replace_malloc.o
 vgpreload_massif_so_LDFLAGS = -shared -Wl,-z,interpose,-z,initfirst
 
 all-local:
        mkdir -p $(inplacedir)
        -rm -f $(addprefix $(inplacedir)/,$(val_PROGRAMS))
-       ln -f -s $(addprefix $(top_srcdir)/$(subdir)/,$(val_PROGRAMS)) $(inplacedir)
+       ln -f -s $(addprefix $(top_builddir)/$(subdir)/,$(val_PROGRAMS)) $(inplacedir)

diff --git a/massif/hp2ps/Makefile.am b/massif/hp2ps/Makefile.am
index f979403fafd2cf042157b58b9087eed4d611253c..58e39a30ddcdd330bbe91e989437999f1370b03e 100644 (file)
--- a/massif/hp2ps/Makefile.am
+++ b/massif/hp2ps/Makefile.am
@@ -1,6 +1,6 @@
 
 valdir = $(libdir)/valgrind
-inplacedir = $(top_srcdir)/.in_place
+inplacedir = $(top_builddir)/.in_place
 
 AM_CPPFLAGS = $(add_includes)
 AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fno-omit-frame-pointer \

diff --git a/memcheck/Makefile.am b/memcheck/Makefile.am
index 9f92680d9180c1f928d7b92ac3770ee8815834d6..ec5c4731e8ea766a4f5a0932d075cea5b66f3f7d 100644 (file)
--- a/memcheck/Makefile.am
+++ b/memcheck/Makefile.am
@@ -9,14 +9,14 @@ AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O2 -fomit-frame-pointer \
 AM_CCASFLAGS = $(all_includes)
 
 valdir = $(libdir)/valgrind
-inplacedir = $(top_srcdir)/.in_place
+inplacedir = $(top_builddir)/.in_place
 
 val_PROGRAMS = vgskin_memcheck.so vgpreload_memcheck.so
 
 vgpreload_memcheck_so_SOURCES = \
        mac_replace_strmem.c
-vgpreload_memcheck_so_LDADD = $(top_srcdir)/coregrind/vg_replace_malloc.o
-vgpreload_memcheck_so_DEPENDENCIES = $(top_srcdir)/coregrind/vg_replace_malloc.o
+vgpreload_memcheck_so_LDADD = $(top_builddir)/coregrind/vg_replace_malloc.o
+vgpreload_memcheck_so_DEPENDENCIES = $(top_builddir)/coregrind/vg_replace_malloc.o
 vgpreload_memcheck_so_LDFLAGS = -shared -Wl,-z,interpose,-z,initfirst
 
 vgskin_memcheck_so_SOURCES = \
@@ -46,4 +46,4 @@ mac_replace_strmem.o: CFLAGS += -fno-omit-frame-pointer
 all-local:
        mkdir -p $(inplacedir)
        -rm -f $(addprefix $(inplacedir)/,$(val_PROGRAMS))
-       ln -f -s $(addprefix $(top_srcdir)/$(subdir)/,$(val_PROGRAMS)) $(inplacedir)
+       ln -f -s $(addprefix $(top_builddir)/$(subdir)/,$(val_PROGRAMS)) $(inplacedir)

diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index 1c3183454370c3c931d01689d354bcc86111820b..fd6349006dc0c2fa6cd56b3ea5fd28c8b7b23c0a 100644 (file)
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -7,6 +7,8 @@ noinst_SCRIPTS = filter_allocs filter_leak_check_size \
                 filter_stderr filter_stderr_backtrace filter_pushfpopf \
                 filter_tronical
 
+INSN_TESTS=insn_basic insn_cmov insn_mmx insn_mmxext insn_sse insn_sse2
+
 EXTRA_DIST = $(noinst_SCRIPTS) \
        badaddrvalue.stderr.exp \
        badaddrvalue.stdout.exp badaddrvalue.vgtest \
@@ -29,8 +31,9 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
        fwrite.stderr.exp fwrite.stdout.exp fwrite.vgtest \
        inits.stderr.exp inits.vgtest \
        inline.stderr.exp inline.stdout.exp inline.vgtest \
-       insn_basic.vgtest insn_cmov.vgtest insn_mmx.vgtest \
-       insn_mmxext.vgtest insn_sse.vgtest insn_sse2.vgtest \
+       $(addsuffix .stderr.exp,$(INSN_TESTS)) \
+       $(addsuffix .stdout.exp,$(INSN_TESTS)) \
+       $(addsuffix .vgtest,$(INSN_TESTS)) \
        malloc1.stderr.exp malloc1.vgtest \
        malloc2.stderr.exp malloc2.vgtest \
        malloc3.stderr.exp malloc3.stdout.exp malloc3.vgtest \

diff --git a/none/Makefile.am b/none/Makefile.am
index 95ab2432454b56da3070829555cddfe65ff2ad62..30a631ea47b24ad2f6ee78fad3c85e42b548760a 100644 (file)
--- a/none/Makefile.am
+++ b/none/Makefile.am
@@ -6,14 +6,14 @@ AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer \
                @PREFERRED_STACK_BOUNDARY@ -g
 
 valdir = $(libdir)/valgrind
-inplacedir = $(top_srcdir)/.in_place
+inplacedir = $(top_builddir)/.in_place
 
 val_PROGRAMS = vgskin_none.so
 
 vgskin_none_so_SOURCES          = nl_main.c
-vgskin_none_so_LDFLAGS   = -shared -Wl,-rpath,$(top_srcdir)/coregrind
+vgskin_none_so_LDFLAGS   = -shared
 
 all-local:
        mkdir -p $(inplacedir)
        -rm -f $(inplacedir)/$(val_PROGRAMS)
-       ln -f -s $(top_srcdir)/$(subdir)/$(val_PROGRAMS) $(inplacedir)/$(val_PROGRAMS)
+       ln -f -s $(top_builddir)/$(subdir)/$(val_PROGRAMS) $(inplacedir)/$(val_PROGRAMS)

diff --git a/none/tests/Makefile.am b/none/tests/Makefile.am
index dfcb4449b3b93a7dc95a1a08a131c8ad7862aeb7..f14a0241b49328aae208e856075d8d2c0f34c18f 100644 (file)
--- a/none/tests/Makefile.am
+++ b/none/tests/Makefile.am
@@ -1,4 +1,7 @@
-noinst_SCRIPTS = filter_cpuid  filter_none_discards filter_stderr
+noinst_SCRIPTS = filter_cpuid  filter_none_discards filter_stderr filter_int gen_insn_test.pl
+
+CLEANFILES = $(addsuffix .c,$(INSN_TESTS))
+INSN_TESTS=insn_basic insn_cmov insn_mmx insn_mmxext insn_sse insn_sse2
 
 EXTRA_DIST = $(noinst_SCRIPTS) \
        args.stderr.exp args.stdout.exp args.vgtest \
@@ -16,8 +19,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
        dastest.vgtest \
        discard.stderr.exp discard.stdout.exp \
        discard.vgtest \
-       exec-sigmask.vgtest 
-       exec-sigmask.stdout.exp exec-sigmask.stderr.exp \
+       exec-sigmask.vgtest exec-sigmask.stdout.exp exec-sigmask.stderr.exp \
        floored.stderr.exp floored.stdout.exp \
        floored.vgtest \
        fork.stderr.exp fork.stdout.exp fork.vgtest \
@@ -25,15 +27,12 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
        fpu_lazy_eflags.vgtest \
        fucomip.stderr.exp fucomip.vgtest \
        gxx304.stderr.exp gxx304.vgtest \
-       insn_basic.stderr.exp insn_basic.stdout.exp insn_basic.vgtest \
-       insn_cmov.stderr.exp insn_cmov.stdout.exp insn_cmov.vgtest \
-       insn_mmx.stderr.exp insn_mmx.stdout.exp insn_mmx.vgtest \
-       insn_mmxext.stderr.exp insn_mmxext.stdout.exp insn_mmxext.vgtest \
-       insn_sse.stderr.exp insn_sse.stdout.exp insn_sse.vgtest \
-       insn_sse2.stderr.exp insn_sse2.stdout.exp insn_sse2.vgtest \
+       $(addsuffix .stderr.exp,$(INSN_TESTS)) \
+       $(addsuffix .stdout.exp,$(INSN_TESTS)) \
+       $(addsuffix .vgtest,$(INSN_TESTS)) \
        int.stderr.exp int.stdout.exp int.vgtest \
-       map_unmap.stdout.exp map_unmap.vgtest \
-       mremap.stdout.exp mremap.vgtest \
+       map_unmap.stderr.exp map_unmap.stdout.exp map_unmap.vgtest \
+       mremap.stderr.exp mremap.stdout.exp mremap.vgtest \
        munmap_exe.stderr.exp munmap_exe.vgtest \
        pth_blockedsig.stderr.exp \
        pth_blockedsig.stdout.exp pth_blockedsig.vgtest \
@@ -52,13 +51,13 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
        smc1.stderr.exp smc1.stdout.exp smc1.vgtest \
        syscall-restart1.vgtest syscall-restart1.stdout.exp syscall-restart1.stderr.exp \
        syscall-restart2.vgtest syscall-restart2.stdout.exp syscall-restart2.stderr.exp \
-       system.stdout.exp system.vgtest
-       yield.stdout.exp yield.vgtest
+       system.stderr.exp system.vgtest \
+       yield.stderr.exp yield.stdout.exp yield.vgtest
 
 check_PROGRAMS = \
        args bitfield1 bt_everything bt_literal closeall coolo_strlen \
        cpuid dastest discard exec-sigmask floored fork fpu_lazy_eflags \
-       fucomip insn_basic insn_cmov insn_mmx insn_mmxext insn_sse insn_sse2 \
+       fucomip $(INSN_TESTS) \
        int munmap_exe map_unmap mremap rcl_assert \
        rcrl readline1 resolv seg_override sha1_test shortpush shorts smc1 \
        pth_blockedsig pushpopseg \
@@ -137,13 +136,5 @@ gxx304_SOURCES             = gxx304.cpp
 # must be built with these flags -- bug only occurred with them
 fpu_lazy_eflags.o: CFLAGS += -O2 -mcpu=pentiumpro -march=pentiumpro
 
-# rebuild instruction tests if test generator changes
-insn_basic.c: gen_insn_test.pl
-insn_cmov.c: gen_insn_test.pl
-insn_mmx.c: gen_insn_test.pl
-insn_mmxext.c: gen_insn_test.pl
-insn_sse.c: gen_insn_test.pl
-insn_sse2.c: gen_insn_test.pl
-
-.def.c:
-       $(PERL) gen_insn_test.pl < $< > $@
+.def.c: $(srcdir)/gen_insn_test.pl
+       $(PERL) $(srcdir)/gen_insn_test.pl < $< > $@