Install VEX headers from the configured version not the default version.

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

diff --git a/Makefile.am b/Makefile.am
index 27ea201d13cd95ee545de530a0765e63786cd744..5815e7dbfa264fc0d31ad7491fe1c7ed0dee44d4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,8 +50,7 @@ EXTRA_DIST = \
        valgrind.spec.in valgrind.pc.in \
        Makefile.all.am Makefile.tool.am Makefile.core-AM_CPPFLAGS.am \
        Makefile.tool-inplace.am \
-       $(VEX_PRIMARY_SOURCES) \
-       $(VEX_PUBLIC_HDRS)
+       $(VEX_PRIMARY_SOURCES)
 
 install-exec-hook:
        $(mkinstalldirs) $(DESTDIR)$(valdir)
@@ -65,9 +64,27 @@ all-local:
 distclean-local:
        rm -rf $(inplacedir)
 
-# These list the bits of vex we need to copy into the tarball
+# These list the bits of vex we need to install
 
 VEX_PUBLIC_HDRS = \
+       @VEX_DIR@/pub/libvex_guest_amd64.h \
+       @VEX_DIR@/pub/libvex_ir.h \
+       @VEX_DIR@/pub/libvex_guest_ppc32.h \
+       @VEX_DIR@/pub/libvex_basictypes.h \
+       @VEX_DIR@/pub/libvex_guest_offsets.h \
+       @VEX_DIR@/pub/libvex_emwarn.h \
+       @VEX_DIR@/pub/libvex.h \
+       @VEX_DIR@/pub/libvex_trc_values.h \
+       @VEX_DIR@/pub/libvex_guest_arm.h \
+       @VEX_DIR@/pub/libvex_guest_x86.h
+
+# These list the bits of vex we need to copy into the tarball
+
+VEX_PRIMARY_SOURCES = \
+       VEX/README \
+       VEX/COPYING \
+       VEX/Makefile \
+       VEX/auxprogs/genoffsets.c \
        VEX/pub/libvex_guest_amd64.h \
        VEX/pub/libvex_ir.h \
        VEX/pub/libvex_guest_ppc32.h \
@@ -77,13 +94,7 @@ VEX_PUBLIC_HDRS = \
        VEX/pub/libvex.h \
        VEX/pub/libvex_trc_values.h \
        VEX/pub/libvex_guest_arm.h \
-       VEX/pub/libvex_guest_x86.h
-
-VEX_PRIMARY_SOURCES = \
-       VEX/README \
-       VEX/COPYING \
-       VEX/Makefile \
-       VEX/auxprogs/genoffsets.c \
+       VEX/pub/libvex_guest_x86.h \
        VEX/priv/ir/irmatch.c \
        VEX/priv/ir/irmatch.h \
        VEX/priv/ir/irdefs.c \