changeset in /hg/icedtea: Fix up Makefile issues found when buil...

[Andrew John Hughes]

changeset 2afddd1c229e in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=2afddd1c229e
description:
	Fix up Makefile issues found when building on Fedora 10.

	2009-05-21  Andrew John Hughes  <ahughes at redhat.com>

		* Makefile.am:
		Cleanup Makefile, make sure JNLP classes
		are included in rt-closed.jar and use this
		as the classpath when building extra-files.

diffstat:

2 files changed, 17 insertions(+), 11 deletions(-)
ChangeLog   |    7 +++++++
Makefile.am |   21 ++++++++++-----------

diffs (78 lines):

diff -r 9d0d19948b10 -r 2afddd1c229e ChangeLog
--- a/ChangeLog	Wed May 20 22:54:07 2009 +0100
+++ b/ChangeLog	Thu May 21 00:16:15 2009 +0100
@@ -1,3 +1,10 @@ 2009-05-20  Lillian Angel  <langel at redha
+2009-05-21  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Cleanup Makefile, make sure JNLP classes
+	are included in rt-closed.jar and use this
+	as the classpath when building extra-files.
+
 2009-05-20  Lillian Angel  <langel at redhat.com>
 
 	* rt/net/sourceforge/jnlp/tools/JarSigner.java: Move creation of 
diff -r 9d0d19948b10 -r 2afddd1c229e Makefile.am
--- a/Makefile.am	Wed May 20 22:54:07 2009 +0100
+++ b/Makefile.am	Thu May 21 00:16:15 2009 +0100
@@ -1955,7 +1955,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-test-atomic-operations.patch \
 	patches/icedtea-zero.patch \
 	patches/icedtea-ia64-bugfix.patch \
-	patches/hotspot/$(HSBUILD)/icedtea-parisc-opt.patch
+	patches/hotspot/$(HSBUILD)/icedtea-parisc-opt.patch \
         patches/security/icedtea-6592792.patch \
         patches/security/icedtea-6733959.patch \
         patches/security/icedtea-6755943.patch \
@@ -2982,10 +2982,12 @@ 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 javax $(LIVECONNECT_DIR) -C lib/rt sun \
+	    -C lib/rt net ; \
 	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 javax $(LIVECONNECT_DIR) -C lib/rt sun \
+	    -C lib/rt net ; \
 	fi
 	if test -d bootstrap/ecj/jre/lib ; \
 	then \
@@ -2997,22 +2999,21 @@ extra-source-files.txt:
 extra-source-files.txt:
 	find $(abs_top_srcdir)/extra -name '*.java' | sort > $@
 
-stamps/extra-class-files.stamp: extra-source-files.txt \
-	bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
+stamps/extra-class-files.stamp: extra-source-files.txt stamps/plugs.stamp
 	mkdir -p extra-lib
 	if ! test -d $(ICEDTEA_BOOT_DIR) ; \
 	then \
 	  $(JAVAC) $(MEMORY_LIMIT) -g -d extra-lib \
 	    -source 1.5 \
-	    -sourcepath \
-	       $(abs_top_srcdir)/extra:$(OPENJDK_SOURCEPATH_DIRS):$(ABS_SOURCE_DIRS)' \
+	    -sourcepath $(abs_top_srcdir)/extra \
+	    -classpath $(ICEDTEA_RT) \
 	    -bootclasspath \'\' \
 	    @extra-source-files.txt ; \
 	else \
 	  $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d extra-lib \
             -source 1.5 \
-	    -sourcepath \
-	       $(abs_top_srcdir)/extra:$(OPENJDK_SOURCEPATH_DIRS):$(ABS_SOURCE_DIRS)' \
+	    -sourcepath $(abs_top_srcdir)/extra \
+	    -classpath $(ICEDTEA_RT) \
 	    -bootclasspath \'\' \
 	    @extra-source-files.txt ; \
 	fi
@@ -3565,8 +3566,6 @@ hotspot-ports: stamps/ports.stamp
 
 tools-class-files: stamps/tools-class-files.stamp
 
-hotspot-ports: stamps/ports.stamp
-
 hotspot-ports-ecj: stamps/ports-ecj.stamp
 
 clean: distclean-local