disasm-test: Makefile tweaks

disasm-test/Makefile.am: Include Makefile.tool-tests.am not Makefile.all.am

Also: do not build disasm-test on platforms other than s390x. There is no
point doing so as you won't be able to run it in a meaningful way.

diff --git a/Makefile.am b/Makefile.am
index a3150abb1481d7247b171dc6f26aecb9aaac2fd3..6c5b9f5b6345b17be36b4911c3940837e6f9cf5f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,7 +33,6 @@ SUBDIRS = \
        perf \
        gdbserver_tests \
        memcheck/tests/vbit-test \
-       none/tests/s390x/disasm-test \
        none/tests/iropt-test \
        auxprogs \
        mpi \

diff --git a/none/tests/Makefile.am b/none/tests/Makefile.am
index 716ce000d39a95375c90e73ad662353e8511d3f6..58e7a524927cd2a7f989cd704d1a02f76455a17b 100644 (file)
--- a/none/tests/Makefile.am
+++ b/none/tests/Makefile.am
@@ -24,7 +24,7 @@ if VGCONF_ARCHS_INCLUDE_ARM64
 SUBDIRS += arm64
 endif
 if VGCONF_ARCHS_INCLUDE_S390X
-SUBDIRS += s390x
+SUBDIRS += s390x s390x/disasm-test
 endif
 if VGCONF_ARCHS_INCLUDE_MIPS32
 SUBDIRS += mips32

diff --git a/none/tests/s390x/disasm-test/Makefile.am b/none/tests/s390x/disasm-test/Makefile.am
index 5629d7d52d786e19f16c48f7faf866f49087d2da..150f38b3210ce00bd07c85510231f3d5ea753376 100644 (file)
--- a/none/tests/s390x/disasm-test/Makefile.am
+++ b/none/tests/s390x/disasm-test/Makefile.am
@@ -1,4 +1,4 @@
-include $(top_srcdir)/Makefile.all.am
+include $(top_srcdir)/Makefile.tool-tests.am
 
 EXTRA_DIST = disasm-test.vgtest disasm-test.stderr.exp \
              disasm-test.post.exp