changeset in /hg/icedtea6: Remove the shared object plugs.

[gnu_andrew at member.fsf.org]

changeset 6e00d6062f4f in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6e00d6062f4f
description:
	Remove the shared object plugs.

diffstat:

3 files changed, 9 insertions(+), 39 deletions(-)
ChangeLog   |    7 +++++++
Makefile.am |   20 +-------------------
Makefile.in |   21 +--------------------

diffs (96 lines):

diff -r 59259282a3ae -r 6e00d6062f4f ChangeLog
--- a/ChangeLog	Wed Jun 25 22:46:25 2008 +0100
+++ b/ChangeLog	Thu Jun 26 01:03:13 2008 +0100
@@ -1,3 +1,10 @@ 2008-06-25  Andrew John Hughes  <gnu_and
+2008-06-26  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	* Makefile.am: Don't bother with the
+	shared object files.  We don't need
+	them any more.
+	* Makefile.in: Regenerated.
+	
 2008-06-25  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	* HACKING: Update with new patch.
diff -r 59259282a3ae -r 6e00d6062f4f Makefile.am
--- a/Makefile.am	Wed Jun 25 22:46:25 2008 +0100
+++ b/Makefile.am	Thu Jun 26 01:03:13 2008 +0100
@@ -725,8 +725,7 @@ stamps/icedtea-against-ecj.stamp: \
 # Binary Plugs and Tools Targets
 # ==============================
 
-stamps/plugs.stamp: $(SHARED_OBJECT_FILES) \
-	bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
+stamps/plugs.stamp: bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
 	mkdir -p stamps
 	touch stamps/plugs.stamp
 
@@ -743,23 +742,6 @@ clean-tools-jar: clean-hotspot-tools
 	rm -f stamps/hotspot-tools.stamp
 	rm -rf tools/
 	rm -f bootstrap/jdk1.7.0/jre/lib/tools.jar
-
-# Shared objects.
-SHARED_OBJECT_FILES = \
-	bootstrap/jdk1.7.0/jre/lib/$(INSTALL_ARCH_DIR)/libdcpr.so \
-	bootstrap/jdk1.7.0/jre/lib/$(INSTALL_ARCH_DIR)/libjsoundhs.so
-
-$(SHARED_OBJECT_FILES):
-	mkdir -p bootstrap/jdk1.7.0/jre/lib/$(INSTALL_ARCH_DIR)
-	for shared_object in $(SHARED_OBJECT_FILES) ; \
-	do \
-	  echo | $(CC) $(CFLAGS) -fpic -shared \
-	    -o $$shared_object \
-	    -Wl,-soname,$$shared_object -xc - ; \
-	done
-
-clean-shared-objects:
-	rm -f $(SHARED_OBJECT_FILES)
 
 # Sources copied from OpenJDK.
 ICEDTEA_COPY_DIRS = \
diff -r 59259282a3ae -r 6e00d6062f4f Makefile.in
--- a/Makefile.in	Wed Jun 25 22:46:25 2008 +0100
+++ b/Makefile.in	Thu Jun 26 01:03:13 2008 +0100
@@ -477,12 +477,6 @@ ICEDTEA_ECJ_PATCH = $(srcdir)/patches/ic
 @WITH_CACAO_FALSE at ICEDTEA_DEBUG_BUILD_TARGET = debug_build
 @WITH_CACAO_TRUE at ICEDTEA_DEBUG_BUILD_TARGET = j2se_fastdebug_only
 
-# Shared objects.
-SHARED_OBJECT_FILES = \
-	bootstrap/jdk1.7.0/jre/lib/$(INSTALL_ARCH_DIR)/libdcpr.so \
-	bootstrap/jdk1.7.0/jre/lib/$(INSTALL_ARCH_DIR)/libjsoundhs.so
-
-
 # Sources copied from OpenJDK.
 ICEDTEA_COPY_DIRS = \
 	com/sun/jdi \
@@ -1190,8 +1184,7 @@ stamps/icedtea-against-ecj.stamp: \
 # Binary Plugs and Tools Targets
 # ==============================
 
-stamps/plugs.stamp: $(SHARED_OBJECT_FILES) \
-	bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
+stamps/plugs.stamp: bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
 	mkdir -p stamps
 	touch stamps/plugs.stamp
 
@@ -1208,18 +1201,6 @@ clean-tools-jar: clean-hotspot-tools
 	rm -f stamps/hotspot-tools.stamp
 	rm -rf tools/
 	rm -f bootstrap/jdk1.7.0/jre/lib/tools.jar
-
-$(SHARED_OBJECT_FILES):
-	mkdir -p bootstrap/jdk1.7.0/jre/lib/$(INSTALL_ARCH_DIR)
-	for shared_object in $(SHARED_OBJECT_FILES) ; \
-	do \
-	  echo | $(CC) $(CFLAGS) -fpic -shared \
-	    -o $$shared_object \
-	    -Wl,-soname,$$shared_object -xc - ; \
-	done
-
-clean-shared-objects:
-	rm -f $(SHARED_OBJECT_FILES)
 
 stamps/copy-source-files.stamp: stamps/patch.stamp
 	for copy_dir in $(ICEDTEA_COPY_DIRS) ; \