From: Nicholas Nethercote <njn@valgrind.org>
Date: Fri, 6 Feb 2009 05:34:19 +0000 (+0000)
Subject: Removed Makefile.core.am with some judicious refactoring.  Also fix a stupid
X-Git-Tag: svn/VALGRIND_3_5_0~1016
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b7b48cb4a6ad65c1b87afb0c197dd8962d3f06eb;p=thirdparty%2Fvalgrind.git

Removed Makefile.core.am with some judicious refactoring.  Also fix a stupid
typo in launcher-linux.c that was added in the last commit.



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

diff --git a/Makefile.tool-inplace.am b/Makefile.inplace.am
similarity index 74%
rename from Makefile.tool-inplace.am
rename to Makefile.inplace.am
index 3ad296a166..839fc32fae 100644
--- a/Makefile.tool-inplace.am
+++ b/Makefile.inplace.am
@@ -1,4 +1,6 @@
-
+# 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)
 
diff --git a/Makefile.install.am b/Makefile.install.am
index cde1a548b1..8ac1db947f 100644
--- a/Makefile.install.am
+++ b/Makefile.install.am
@@ -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.
diff --git a/Makefile.tool.am b/Makefile.tool.am
index b02ee377c5..3c6be1a9ee 100644
--- a/Makefile.tool.am
+++ b/Makefile.tool.am
@@ -3,8 +3,8 @@ SUBDIRS = . tests docs
 
 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 = \
diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index d7963414bc..4ae49d35bd 100644
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -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
 
 
@@ -419,15 +420,6 @@ clean-local:
 
 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
diff --git a/coregrind/launcher-linux.c b/coregrind/launcher-linux.c
index d7ed224eda..75dfbfaa7c 100644
--- a/coregrind/launcher-linux.c
+++ b/coregrind/launcher-linux.c
@@ -243,7 +243,7 @@ int main(int argc, char** argv, char** envp)
        (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);