|
From: <sv...@va...> - 2005-07-26 10:43:00
|
Author: sewardj
Date: 2005-07-26 11:42:57 +0100 (Tue, 26 Jul 2005)
New Revision: 4266
Log:
Makefile stuff, partly from Tom, which uses the SVN-externall'd VEX
tree a bit better. Also, fixes to make 'make dist' include into the
final tarball a minimal but workable subset of the stuff in the VEX
directory.
Note, you must do 'make' or 'make install' before 'make dist' since
otherwise VEX/priv/main/vex_svnversion.h will not exist.
Modified:
trunk/Makefile.am
trunk/configure.in
trunk/coregrind/Makefile.am
trunk/coregrind/m_dispatch/Makefile.am
trunk/coregrind/m_syswrap/Makefile.am
Modified: trunk/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/Makefile.am 2005-07-26 10:40:31 UTC (rev 4265)
+++ trunk/Makefile.am 2005-07-26 10:42:57 UTC (rev 4266)
@@ -46,7 +46,8 @@
README_MISSING_SYSCALL_OR_IOCTL \
valgrind.spec.in valgrind.pc.in \
Makefile.all.am Makefile.tool.am Makefile.core-AM_CPPFLAGS.am \
- Makefile.tool-inplace.am
+ Makefile.tool-inplace.am \
+ $(VEX_PRIMARY_SOURCES)
=20
install-exec-hook:
$(mkinstalldirs) $(DESTDIR)$(valdir)
@@ -59,3 +60,66 @@
=20
distclean-local:
rm -rf $(inplacedir)
+
+
+# This lists the bits of vex we need to copy into the tarball
+
+VEX_PRIMARY_SOURCES =3D \
+ 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 \
+ VEX/pub/libvex_basictypes.h \
+ VEX/pub/libvex_guest_offsets.h \
+ VEX/pub/libvex_emwarn.h \
+ VEX/pub/libvex.h \
+ VEX/pub/libvex_trc_values.h \
+ VEX/pub/libvex_guest_arm.h \
+ VEX/pub/libvex_guest_x86.h \
+ VEX/priv/ir/irmatch.c \
+ VEX/priv/ir/irmatch.h \
+ VEX/priv/ir/irdefs.c \
+ VEX/priv/ir/iropt.c \
+ VEX/priv/ir/iropt.h \
+ VEX/priv/host-ppc32/isel.c \
+ VEX/priv/host-ppc32/hdefs.c \
+ VEX/priv/host-ppc32/hdefs.h \
+ VEX/priv/main/vex_svnversion.h \
+ VEX/priv/main/vex_globals.c \
+ VEX/priv/main/vex_globals.h \
+ VEX/priv/main/vex_main.c \
+ VEX/priv/main/vex_util.c \
+ VEX/priv/main/vex_util.h \
+ VEX/priv/guest-arm/ghelpers.c \
+ VEX/priv/guest-arm/gdefs.h \
+ VEX/priv/guest-arm/toIR.c \
+ VEX/priv/guest-x86/ghelpers.c \
+ VEX/priv/guest-x86/gdefs.h \
+ VEX/priv/guest-x86/toIR.c \
+ VEX/priv/guest-generic/g_generic_x87.c \
+ VEX/priv/guest-generic/g_generic_x87.h \
+ VEX/priv/guest-generic/bb_to_IR.c \
+ VEX/priv/guest-generic/bb_to_IR.h \
+ VEX/priv/host-arm/isel.c \
+ VEX/priv/host-arm/hdefs.c \
+ VEX/priv/host-arm/hdefs.h \
+ VEX/priv/host-x86/isel.c \
+ VEX/priv/host-x86/hdefs.c \
+ VEX/priv/host-x86/hdefs.h \
+ VEX/priv/guest-amd64/ghelpers.c \
+ VEX/priv/guest-amd64/gdefs.h \
+ VEX/priv/guest-amd64/toIR.c \
+ VEX/priv/guest-ppc32/ghelpers.c \
+ VEX/priv/guest-ppc32/gdefs.h \
+ VEX/priv/guest-ppc32/toIR.c \
+ VEX/priv/host-generic/reg_alloc2.c \
+ VEX/priv/host-generic/h_generic_regs.c \
+ VEX/priv/host-generic/h_generic_regs.h \
+ VEX/priv/host-generic/h_generic_simd64.c \
+ VEX/priv/host-generic/h_generic_simd64.h \
+ VEX/priv/host-amd64/isel.c \
+ VEX/priv/host-amd64/hdefs.c \
+ VEX/priv/host-amd64/hdefs.h
Modified: trunk/configure.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/configure.in 2005-07-26 10:40:31 UTC (rev 4265)
+++ trunk/configure.in 2005-07-26 10:42:57 UTC (rev 4266)
@@ -10,17 +10,17 @@
# Nb: For the 2nd arg, the help string, AS_HELP_STRING is the proper way=
, but
# older autoconfs don't support it... here's what it would say:
#
-# AS_HELP_STRING([--with-vex], [Vex directory (must be specified!)]),
+# AS_HELP_STRING([--with-vex], [Vex directory]),
#
AC_ARG_WITH(vex,=20
- [ --with-vex=3D/path/to/vex/dir Vex directory (must be specified=
!)],
+ [ --with-vex=3D/path/to/vex/dir Vex directory],
[
AC_CHECK_FILE($withval/pub/libvex.h,
[VEX_DIR=3D$withval],
[AC_MSG_ERROR([Directory '$withval' does not exist, or does not =
contain Vex])])
],
[
- AC_MSG_ERROR([You must specify --with-vex=3D/path/to/vex/dir])
+ VEX_DIR=3D`pwd`/VEX
])
AC_SUBST(VEX_DIR)
=20
Modified: trunk/coregrind/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/Makefile.am 2005-07-26 10:40:31 UTC (rev 4265)
+++ trunk/coregrind/Makefile.am 2005-07-26 10:42:57 UTC (rev 4266)
@@ -82,7 +82,7 @@
=20
BUILT_SOURCES =3D stage2.lds
CLEANFILES =3D stage2.lds
-=09
+
valgrind_SOURCES =3D \
stage1.c \
m_debuglog.c \
@@ -195,6 +195,15 @@
-e '/\. =3D 0x[0-9A-Fa-f]\+ + SIZEOF_HEADERS/s/0x[0-9A-Fa-f]\+/kicksta=
rt_base/g' > $@ \
|| rm -f $@
=20
+@VEX_DIR@/libvex.a: @VEX_DIR@/priv/main/vex_svnversion.h
+ $(MAKE) -C @VEX_DIR@ libvex.a EXTRA_CFLAGS=3D"@PIE_AM_CFLAGS@"
+
+@VEX_DIR@/priv/main/vex_svnversion.h:
+ $(MAKE) -C @VEX_DIR@ version
+
+clean-local:
+ $(MAKE) -C @VEX_DIR@ clean
+
MANUAL_DEPS =3D $(noinst_HEADERS) $(include_HEADERS)
=20
all-local:
Modified: trunk/coregrind/m_dispatch/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_dispatch/Makefile.am 2005-07-26 10:40:31 UTC (rev 4=
265)
+++ trunk/coregrind/m_dispatch/Makefile.am 2005-07-26 10:42:57 UTC (rev 4=
266)
@@ -9,3 +9,8 @@
=20
libdispatch_a_SOURCES =3D \
dispatch-@VG_ARCH@.S
+
+dispatch-@VG_ARCH@.S: libvex_guest_offsets.h
+
+libvex_guest_offsets.h:
+ $(MAKE) -C @VEX_DIR@ pub/libvex_guest_offsets.h
Modified: trunk/coregrind/m_syswrap/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_syswrap/Makefile.am 2005-07-26 10:40:31 UTC (rev 42=
65)
+++ trunk/coregrind/m_syswrap/Makefile.am 2005-07-26 10:42:57 UTC (rev 42=
66)
@@ -21,3 +21,9 @@
syswrap-@VG_OS@.c \
syswrap-@VG_PLATFORM@.c \
syswrap-main.c
+
+syscall-@VG_PLATFORM@.S: libvex_guest_offsets.h
+syswrap-main.c: libvex_guest_offsets.h
+
+libvex_guest_offsets.h:
+ $(MAKE) -C @VEX_DIR@ pub/libvex_guest_offsets.h
|
|
From: Tom H. <to...@co...> - 2005-07-26 11:47:12
|
In message <200...@op...>
sv...@va... wrote:
> Note, you must do 'make' or 'make install' before 'make dist' since
> otherwise VEX/priv/main/vex_svnversion.h will not exist.
That shouldn't be needed - the dist target should depend on that
header to make sure it is up to date.
Tom
--
Tom Hughes (to...@co...)
http://www.compton.nu/
|