changeset in /hg/icedtea: * Makefile.am (LIVECONNECT_DIR): Add -...

[Mark Wielaard]

changeset dc7d6bc54c98 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=dc7d6bc54c98
description:
	* Makefile.am (LIVECONNECT_DIR): Add -C lib/rt net.
		(rt-closed.jar): Don't unconditionally add -C lib/rt net.

diffstat:

2 files changed, 9 insertions(+), 6 deletions(-)
ChangeLog   |    5 +++++
Makefile.am |   10 ++++------

diffs (46 lines):

diff -r 5744d25c5a37 -r dc7d6bc54c98 ChangeLog
--- a/ChangeLog	Sat May 23 00:46:40 2009 +0100
+++ b/ChangeLog	Sat May 23 23:23:12 2009 +0200
@@ -1,3 +1,8 @@ 2009-05-22  Andrew John Hughes  <ahughes
+2009-05-23  Mark Wielaard  <mark at klomp.org>
+
+	* Makefile.am (LIVECONNECT_DIR): Add -C lib/rt net.
+	(rt-closed.jar): Don't unconditionally add -C lib/rt net.
+
 2009-05-22  Andrew John Hughes  <ahughes at redhat.com>
 
 	* ports/hotspot/src/cpu/zero/vm/globals_zero.hpp:
diff -r 5744d25c5a37 -r dc7d6bc54c98 Makefile.am
--- a/Makefile.am	Sat May 23 00:46:40 2009 +0100
+++ b/Makefile.am	Sat May 23 23:23:12 2009 +0200
@@ -26,13 +26,13 @@ ICEDTEAPLUGIN_CLEAN = clean-IcedTeaNPPlu
 ICEDTEAPLUGIN_CLEAN = clean-IcedTeaNPPlugin
 ICEDTEAPLUGIN_TARGET = IcedTeaNPPlugin.so
 PLUGIN_PATCH = patches/icedtea-liveconnect.patch
-LIVECONNECT_DIR = -C lib/rt netscape
+LIVECONNECT_DIR = -C lib/rt netscape -C lib/rt net
 else
 if ENABLE_PLUGIN
 ICEDTEAPLUGIN_CLEAN = clean-IcedTeaPlugin
 ICEDTEAPLUGIN_TARGET = IcedTeaPlugin.so
 PLUGIN_PATCH = patches/icedtea-liveconnect.patch
-LIVECONNECT_DIR = -C lib/rt netscape
+LIVECONNECT_DIR = -C lib/rt netscape -C lib/rt net
 else
 ICEDTEAPLUGIN_CLEAN =
 ICEDTEAPLUGIN_TARGET =
@@ -3073,12 +3073,10 @@ bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
 	if ! test -d $(ICEDTEA_BOOT_DIR) ; \
 	then \
 	  $(JAR) cf $@ -C lib/rt com -C lib/rt java \
-	    -C lib/rt javax $(LIVECONNECT_DIR) -C lib/rt sun \
-	    -C lib/rt net ; \
+	    -C lib/rt javax $(LIVECONNECT_DIR) -C lib/rt sun ; \
 	else \
 	  $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/rt com -C lib/rt java \
-	    -C lib/rt javax $(LIVECONNECT_DIR) -C lib/rt sun \
-	    -C lib/rt net ; \
+	    -C lib/rt javax $(LIVECONNECT_DIR) -C lib/rt sun ; \
 	fi
 	if test -d bootstrap/ecj/jre/lib ; \
 	then \