Fix 'make dist' following recent gdbserver commits.

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

diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index e577145ab5cb157e7d9d00e9cc68e6b435bdf002..160cd93e0d338e81538b7e7b3808aa2f2dc8fa6d 100644 (file)
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -470,90 +470,64 @@ endif
 #----------------------------------------------------------------------------
 # gdbserver xml target descriptions
 #----------------------------------------------------------------------------
-pkglib_DATA =
-
-if VGCONF_ARCHS_INCLUDE_ARM
-pkglib_DATA +=         m_gdbserver/arm-core-valgrind-s1.xml \
-               m_gdbserver/arm-core-valgrind-s2.xml \
-               m_gdbserver/arm-core.xml \
-               m_gdbserver/arm-vfpv3-valgrind-s1.xml \
-               m_gdbserver/arm-vfpv3-valgrind-s2.xml \
-               m_gdbserver/arm-vfpv3.xml \
-               m_gdbserver/arm-with-vfpv3-valgrind.xml \
-               m_gdbserver/arm-with-vfpv3.xml
-endif
-
-if VGCONF_ARCHS_INCLUDE_X86
-pkglib_DATA +=         m_gdbserver/32bit-core-valgrind-s1.xml \
-               m_gdbserver/32bit-core-valgrind-s2.xml \
-               m_gdbserver/32bit-core.xml \
-               m_gdbserver/32bit-sse-valgrind-s1.xml \
-               m_gdbserver/32bit-sse-valgrind-s2.xml \
-               m_gdbserver/32bit-sse.xml
-if VGCONF_OS_IS_LINUX
-pkglib_DATA += m_gdbserver/32bit-linux-valgrind-s1.xml \
-               m_gdbserver/32bit-linux-valgrind-s2.xml \
-               m_gdbserver/32bit-linux.xml \
-               m_gdbserver/i386-linux-valgrind.xml
-endif
-if VGCONF_OS_IS_DARWIN
-pkglib_DATA += m_gdbserver/i386-coresse-valgrind.xml
-endif
-endif
-
-if VGCONF_ARCHS_INCLUDE_AMD64
-pkglib_DATA += m_gdbserver/64bit-core-valgrind-s1.xml \
-               m_gdbserver/64bit-core-valgrind-s2.xml \
-               m_gdbserver/64bit-core.xml \
-               m_gdbserver/64bit-sse-valgrind-s1.xml \
-               m_gdbserver/64bit-sse-valgrind-s2.xml \
-               m_gdbserver/64bit-sse.xml
-
-if VGCONF_OS_IS_LINUX
-pkglib_DATA += m_gdbserver/64bit-linux-valgrind-s1.xml \
-               m_gdbserver/64bit-linux-valgrind-s2.xml \
-               m_gdbserver/64bit-linux.xml \
-               m_gdbserver/amd64-linux-valgrind.xml
-endif
-if VGCONF_OS_IS_DARWIN
-pkglib_DATA += m_gdbserver/amd64-coresse-valgrind.xml
-endif
-endif
-
-if VGCONF_ARCHS_INCLUDE_PPC32
-pkglib_DATA += m_gdbserver/power-altivec-valgrind-s1.xml \
-               m_gdbserver/power-altivec-valgrind-s2.xml \
-               m_gdbserver/power-altivec.xml \
-               m_gdbserver/power-core.xml \
-               m_gdbserver/power-fpu-valgrind-s1.xml \
-               m_gdbserver/power-fpu-valgrind-s2.xml \
-               m_gdbserver/power-fpu.xml \
-               m_gdbserver/power-linux-valgrind-s1.xml \
-               m_gdbserver/power-linux-valgrind-s2.xml \
-               m_gdbserver/power-linux.xml \
-               m_gdbserver/powerpc-altivec32l-valgrind.xml \
-               m_gdbserver/powerpc-altivec32l.xml
-endif
-
-if VGCONF_ARCHS_INCLUDE_PPC64
-pkglib_DATA += m_gdbserver/power64-core-valgrind-s1.xml \
-               m_gdbserver/power64-core-valgrind-s2.xml \
-               m_gdbserver/power64-core.xml \
-               m_gdbserver/power64-linux-valgrind-s1.xml \
-               m_gdbserver/power64-linux-valgrind-s2.xml \
-               m_gdbserver/power64-linux.xml \
-               m_gdbserver/powerpc-altivec64l-valgrind.xml \
-               m_gdbserver/powerpc-altivec64l.xml
-if ! VGCONF_ARCHS_INCLUDE_PPC32
-pkglib_DATA += m_gdbserver/power-altivec-valgrind-s1.xml \
-               m_gdbserver/power-altivec-valgrind-s2.xml \
-               m_gdbserver/power-altivec.xml \
-               m_gdbserver/power-fpu-valgrind-s1.xml \
-               m_gdbserver/power-fpu-valgrind-s2.xml \
-               m_gdbserver/power-fpu.xml
-endif
-endif
 
+GDBSERVER_XML_FILES = \
+       m_gdbserver/32bit-core-valgrind-s1.xml \
+       m_gdbserver/32bit-core-valgrind-s2.xml \
+       m_gdbserver/32bit-core.xml \
+       m_gdbserver/32bit-linux-valgrind-s1.xml \
+       m_gdbserver/32bit-linux-valgrind-s2.xml \
+       m_gdbserver/32bit-linux.xml \
+       m_gdbserver/32bit-sse-valgrind-s1.xml \
+       m_gdbserver/32bit-sse-valgrind-s2.xml \
+       m_gdbserver/32bit-sse.xml \
+       m_gdbserver/64bit-core-valgrind-s1.xml \
+       m_gdbserver/64bit-core-valgrind-s2.xml \
+       m_gdbserver/64bit-core.xml \
+       m_gdbserver/64bit-linux-valgrind-s1.xml \
+       m_gdbserver/64bit-linux-valgrind-s2.xml \
+       m_gdbserver/64bit-linux.xml \
+       m_gdbserver/64bit-sse-valgrind-s1.xml \
+       m_gdbserver/64bit-sse-valgrind-s2.xml \
+       m_gdbserver/64bit-sse.xml \
+       m_gdbserver/amd64-coresse-valgrind.xml \
+       m_gdbserver/amd64-linux-valgrind.xml \
+       m_gdbserver/arm-core-valgrind-s1.xml \
+       m_gdbserver/arm-core-valgrind-s2.xml \
+       m_gdbserver/arm-core.xml \
+       m_gdbserver/arm-vfpv3-valgrind-s1.xml \
+       m_gdbserver/arm-vfpv3-valgrind-s2.xml \
+       m_gdbserver/arm-vfpv3.xml \
+       m_gdbserver/arm-with-vfpv3-valgrind.xml \
+       m_gdbserver/arm-with-vfpv3.xml \
+       m_gdbserver/i386-coresse-valgrind.xml \
+       m_gdbserver/i386-linux-valgrind.xml \
+       m_gdbserver/power64-core-valgrind-s1.xml \
+       m_gdbserver/power64-core-valgrind-s2.xml \
+       m_gdbserver/power64-core.xml \
+       m_gdbserver/power64-linux-valgrind-s1.xml \
+       m_gdbserver/power64-linux-valgrind-s2.xml \
+       m_gdbserver/power64-linux.xml \
+       m_gdbserver/power-altivec-valgrind-s1.xml \
+       m_gdbserver/power-altivec-valgrind-s2.xml \
+       m_gdbserver/power-altivec.xml \
+       m_gdbserver/power-core.xml \
+       m_gdbserver/power-fpu-valgrind-s1.xml \
+       m_gdbserver/power-fpu-valgrind-s2.xml \
+       m_gdbserver/power-fpu.xml \
+       m_gdbserver/power-linux-valgrind-s1.xml \
+       m_gdbserver/power-linux-valgrind-s2.xml \
+       m_gdbserver/power-linux.xml \
+       m_gdbserver/powerpc-altivec32l-valgrind.xml \
+       m_gdbserver/powerpc-altivec32l.xml \
+       m_gdbserver/powerpc-altivec64l-valgrind.xml \
+       m_gdbserver/powerpc-altivec64l.xml
+
+# so as to make sure these get copied into the install tree
+pkglib_DATA  = $(GDBSERVER_XML_FILES)
+
+# so as to make sure these get copied into the tarball
+EXTRA_DIST  += $(GDBSERVER_XML_FILES)
 
 #----------------------------------------------------------------------------
 # General stuff

diff --git a/gdbserver_tests/Makefile.am b/gdbserver_tests/Makefile.am
index f1af31c02f654c591656dee1354c7ff889612410..7332a796d9a17bd58a82bcf76b9adb0ad11fd434 100644 (file)
--- a/gdbserver_tests/Makefile.am
+++ b/gdbserver_tests/Makefile.am
@@ -45,6 +45,11 @@ EXTRA_DIST = \
        mcleak.stdoutB.exp \
        mcleak.vgtest \
        mcmain_pic.vgtest \
+       mcmain_pic.stderrB.exp \
+       mcmain_pic.stderr.exp \
+       mcmain_pic.stdinB.gdb \
+       mcmain_pic.stdoutB.exp \
+       mcmain_pic.stdout.exp \
        mcsignopass.stderrB.exp \
        mcsignopass.stderr.exp \
        mcsignopass.stdinB.gdb \

diff --git a/include/Makefile.am b/include/Makefile.am
index ae1f0cae9a6ed42ce9587d22f1c660eaa9935748..faa3c3aa1cb142558f61b9a7753e2d840e919870 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -12,6 +12,7 @@ nobase_pkginclude_HEADERS = \
        pub_tool_debuginfo.h            \
        pub_tool_errormgr.h             \
        pub_tool_execontext.h           \
+       pub_tool_gdbserver.h            \
        pub_tool_hashtable.h            \
        pub_tool_libcbase.h             \
        pub_tool_libcassert.h           \
@@ -44,19 +45,19 @@ nobase_pkginclude_HEADERS = \
        vki/vki-posixtypes-ppc32-linux.h \
        vki/vki-posixtypes-ppc64-linux.h \
        vki/vki-posixtypes-x86-linux.h   \
-       vki/vki-posixtypes-arm-linux.h   \
+       vki/vki-posixtypes-arm-linux.h   \
        vki/vki-posixtypes-s390x-linux.h \
        vki/vki-amd64-linux.h           \
        vki/vki-ppc32-linux.h           \
        vki/vki-ppc64-linux.h           \
        vki/vki-x86-linux.h             \
-       vki/vki-arm-linux.h             \
+       vki/vki-arm-linux.h             \
        vki/vki-s390x-linux.h           \
        vki/vki-scnums-amd64-linux.h    \
        vki/vki-scnums-ppc32-linux.h    \
        vki/vki-scnums-ppc64-linux.h    \
        vki/vki-scnums-x86-linux.h      \
-       vki/vki-scnums-arm-linux.h      \
+       vki/vki-scnums-arm-linux.h      \
        vki/vki-scnums-s390x-linux.h    \
        vki/vki-scnums-darwin.h