|
From: <sv...@va...> - 2005-11-09 14:04:45
|
Author: sewardj
Date: 2005-11-09 14:04:27 +0000 (Wed, 09 Nov 2005)
New Revision: 5053
Log:
Install libvex.a and libcoregrind.a, needed for external tool builds.
Modified:
trunk/Makefile.install.am
trunk/coregrind/Makefile.am
Modified: trunk/Makefile.install.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.install.am 2005-11-09 08:52:56 UTC (rev 5052)
+++ trunk/Makefile.install.am 2005-11-09 14:04:27 UTC (rev 5053)
@@ -1,3 +1,14 @@
+
+# What the second for loop does: it copies libcoregrind.a and libvex.a
+# into the correct (target-specific) lib dirs at install time.
+# $(noinst_LIBRARIES) will look like this:
+# libcoregrind_x86_linux.a libreplacemalloc_toolpreload_x86_linux.a
+# libcoregrind_amd64_linux.a libreplacemalloc_toolpreload_amd64_linux=
.a
+# The 'if expr' filters out all but the libcoregrind_ ones.
+# pD and pU are the (arch,os) target pairs separated by a dash (pD) or
+# an underscore (pU) respectively, eg amd64-linux (pD) and amd64_linux (=
pU).
+# It then copies libcoregrind.a and libvex.a to the right places.
+
install-exec-local:
for f in $(noinst_PROGRAMS); do \
p=3D`echo $$f | sed -e 's/^[^-]*-//' -e 's/\..*$$//'`; \
@@ -4,4 +15,12 @@
n=3D`echo $$f | sed -e 's/-[^-]\{1,\}-[^-.]\{1,\}//'`; \
$(mkinstalldirs) $(DESTDIR)$(valdir)/$$p; \
$(INSTALL_PROGRAM) $$f $(DESTDIR)$(valdir)/$$p/$$n; \
+ done ; \
+ for f in $(noinst_LIBRARIES); do \
+ if expr match $$f libcoregrind_ > /dev/null ; then \
+ pU=3D`echo $$f | sed -e 's/libcoregrind_//g' -e 's/\.a//g'` ; \
+ pD=3D`echo $$pU | sed -e 's/_/-/g'` ; \
+ $(INSTALL_PROGRAM) $$f $(DESTDIR)$(valdir)/$$pD/libcoregrind.a ; \
+ $(INSTALL_PROGRAM) @VEX_DIR@/libvex_$$pU.a $(DESTDIR)$(valdir)/$$pD=
/libvex.a ; \
+ fi ; \
done
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-11-09 08:52:56 UTC (rev 5052)
+++ trunk/coregrind/Makefile.am 2005-11-09 14:04:27 UTC (rev 5053)
@@ -1,3 +1,9 @@
+
+# Be very careful when renaming any files, targets, whatever, in this
+# Makefile. The install-exec-local target in ../Makefile.install.am
+# does some fragile sed file-name-mangling which is liable to break if
+# the names of noinst_LIBRARIES or noinst_PROGRAMS change 'shape'.
+
include $(top_srcdir)/Makefile.all.am
include $(top_srcdir)/Makefile.core.am
include $(top_srcdir)/Makefile.install.am
|