|
From: <sv...@va...> - 2009-02-06 06:39:43
|
Author: njn
Date: 2009-02-06 06:39:37 +0000 (Fri, 06 Feb 2009)
New Revision: 9117
Log:
Merged r9116 (removed Makefile.core.am and fixed launcher-linux.c) from the
trunk.
Added:
branches/DARWIN/Makefile.inplace.am
Removed:
branches/DARWIN/Makefile.tool-inplace.am
Modified:
branches/DARWIN/Makefile.install.am
branches/DARWIN/Makefile.tool.am
branches/DARWIN/coregrind/Makefile.am
branches/DARWIN/coregrind/launcher-linux.c
Copied: branches/DARWIN/Makefile.inplace.am (from rev 9116, trunk/Makefile.inplace.am)
===================================================================
--- branches/DARWIN/Makefile.inplace.am (rev 0)
+++ branches/DARWIN/Makefile.inplace.am 2009-02-06 06:39:37 UTC (rev 9117)
@@ -0,0 +1,16 @@
+# This is used by coregrind/Makefile.am and Makefile.tool.am for doing
+# "in-place" installs. It copies $(noinst_PROGRAMS) into $inplacedir, doing
+# some magic renaming as it does.
+# For a description of what these magic sed commands do, see comments
+# in Makefile.install.am (which has identical magic)
+
+all-local:
+ if [ -n "$(noinst_PROGRAMS)" ] ; then \
+ for f in $(noinst_PROGRAMS); do \
+ name=`echo $$f | sed -e 's/-\([^-]*-[^-.]*\)\(\..*\)\{0,1\}$$/\2/'`; \
+ plat=`echo $$f | sed -e 's/^.*-\([^-]*-[^-.]*\)\(\..*\)\{0,1\}$$/\1/'`; \
+ mkdir -p $(inplacedir)/$$plat; \
+ rm -f $(inplacedir)/$$plat/$$name; \
+ ln -f -s ../../$(subdir)/$$f $(inplacedir)/$$plat/$$name; \
+ done ; \
+ fi
Modified: branches/DARWIN/Makefile.install.am
===================================================================
--- branches/DARWIN/Makefile.install.am 2009-02-06 05:34:19 UTC (rev 9116)
+++ branches/DARWIN/Makefile.install.am 2009-02-06 06:39:37 UTC (rev 9117)
@@ -10,7 +10,7 @@
# $prefix/lib/valgrind/omega-x86-linux/exp
# or similarly mutant place.
#
-# Note there is identical sed magic in Makefile.tool-inplace.am.
+# Note there is identical sed magic in Makefile.inplace.am.
# What the second for loop does: it copies libcoregrind.a and libvex.a
# into the correct (target-specific) lib dirs at install time.
Deleted: branches/DARWIN/Makefile.tool-inplace.am
===================================================================
--- branches/DARWIN/Makefile.tool-inplace.am 2009-02-06 05:34:19 UTC (rev 9116)
+++ branches/DARWIN/Makefile.tool-inplace.am 2009-02-06 06:39:37 UTC (rev 9117)
@@ -1,14 +0,0 @@
-
-# For a description of what these magic sed commands do, see comments
-# in Makefile.install.am (which has identical magic)
-
-all-local:
- if [ -n "$(noinst_PROGRAMS)" ] ; then \
- for f in $(noinst_PROGRAMS); do \
- name=`echo $$f | sed -e 's/-\([^-]*-[^-.]*\)\(\..*\)\{0,1\}$$/\2/'`; \
- plat=`echo $$f | sed -e 's/^.*-\([^-]*-[^-.]*\)\(\..*\)\{0,1\}$$/\1/'`; \
- mkdir -p $(inplacedir)/$$plat; \
- rm -f $(inplacedir)/$$plat/$$name; \
- ln -f -s ../../$(subdir)/$$f $(inplacedir)/$$plat/$$name; \
- done ; \
- fi
Modified: branches/DARWIN/Makefile.tool.am
===================================================================
--- branches/DARWIN/Makefile.tool.am 2009-02-06 05:34:19 UTC (rev 9116)
+++ branches/DARWIN/Makefile.tool.am 2009-02-06 06:39:37 UTC (rev 9117)
@@ -3,8 +3,8 @@
include $(top_srcdir)/Makefile.all.am
include $(top_srcdir)/Makefile.flags.am
+include $(top_srcdir)/Makefile.inplace.am
include $(top_srcdir)/Makefile.install.am
-include $(top_srcdir)/Makefile.tool-inplace.am
LIBREPLACEMALLOC_X86_LINUX = \
Modified: branches/DARWIN/coregrind/Makefile.am
===================================================================
--- branches/DARWIN/coregrind/Makefile.am 2009-02-06 05:34:19 UTC (rev 9116)
+++ branches/DARWIN/coregrind/Makefile.am 2009-02-06 06:39:37 UTC (rev 9117)
@@ -6,6 +6,7 @@
include $(top_srcdir)/Makefile.all.am
include $(top_srcdir)/Makefile.flags.am
+include $(top_srcdir)/Makefile.inplace.am
include $(top_srcdir)/Makefile.install.am
AM_CPPFLAGS_CORE_COMMON = \
@@ -599,15 +600,6 @@
MANUAL_DEPS = $(noinst_HEADERS) $(include_HEADERS)
-all-local:
- for f in $(noinst_PROGRAMS); do \
- p=`echo $$f | sed -e 's/^[^-]*-//' -e 's/\..*$$//'`; \
- n=`echo $$f | sed -e 's/-[^-]\{1,\}-[^-.]\{1,\}//'`; \
- mkdir -p $(inplacedir)/$$p; \
- rm -f $(inplacedir)/$$p/$$n; \
- ln -f -s ../../$(subdir)/$$f $(inplacedir)/$$p/$$n; \
- done
-
EXTRA_DIST = \
m_debuginfo/UNUSED_STABS.txt \
m_debuginfo/README.txt
Modified: branches/DARWIN/coregrind/launcher-linux.c
===================================================================
--- branches/DARWIN/coregrind/launcher-linux.c 2009-02-06 05:34:19 UTC (rev 9116)
+++ branches/DARWIN/coregrind/launcher-linux.c 2009-02-06 06:39:37 UTC (rev 9117)
@@ -243,7 +243,7 @@
(0==strcmp(VG_PLATFORM,"amd64-linux")) ||
(0==strcmp(VG_PLATFORM,"ppc32-linux")) ||
(0==strcmp(VG_PLATFORM,"ppc64-linux")))
- default_platform = VG_PLATFORM"ppc32-linux";
+ default_platform = VG_PLATFORM;
else
barf("Unknown VG_PLATFORM '%s'", VG_PLATFORM);
|