changeset in /hg/icedtea: Patch from Mark Wielaard: Use rt and g...

[gnu_andrew at member.fsf.org]

changeset 62c48476a238 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=62c48476a238
description:
	Patch from Mark Wielaard: Use rt and generated as necessary.

diffstat:

3 files changed, 16 insertions(+), 10 deletions(-)
ChangeLog   |    6 ++++++
Makefile.am |   10 +++++-----
Makefile.in |   10 +++++-----

diffs (95 lines):

diff -r 837336085669 -r 62c48476a238 ChangeLog
--- a/ChangeLog	Tue May 27 20:24:02 2008 +0100
+++ b/ChangeLog	Tue May 27 20:26:21 2008 +0100
@@ -1,3 +1,9 @@ 2008-05-27  Andrew John Hughes  <gnu_and
+2008-05-27  Mark Wielaard  <mark at klomp.org>
+
+	* Makefile.am:
+	Use generated and rt as necessary.
+	* Makefile.in: Regenerated.
+
 2008-05-27  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	* Makefile.am:
diff -r 837336085669 -r 62c48476a238 Makefile.am
--- a/Makefile.am	Tue May 27 20:24:02 2008 +0100
+++ b/Makefile.am	Tue May 27 20:26:21 2008 +0100
@@ -836,12 +836,12 @@ stamps/hotspot-tools-class-files.stamp: 
 	if ! test -f stamps/icedtea-ecj.stamp ; \
 	then \
 	  $(JAVAC) $(MEMORY_LIMIT) -g -d lib/hotspot-tools -bootclasspath '' -source 1.6 \
-	    -sourcepath 'rt:generated:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
+	    -sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
 	    @$< ; \
 	else \
 	  $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
 	    -bootclasspath '' -source 1.6 \
-            -sourcepath 'rt:generated:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
+            -sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
             @$< ; \
 	fi
 	mkdir -p stamps
@@ -875,19 +875,19 @@ bootstrap/jdk1.7.0/jre/lib/tools.jar: st
 
 # rt-closed.jar class files.
 rt-source-files.txt: stamps/clone.stamp stamps/copy-source-files.stamp
-	find $(abs_top_srcdir)/rt rt -name '*.java' | sort > $@
+	find $(abs_top_srcdir)/rt -name '*.java' | sort > $@
 
 stamps/rt-class-files.stamp: rt-source-files.txt stamps/generated.stamp
 	mkdir -p lib/rt
 	if ! test -f stamps/icedtea-ecj.stamp ; \
         then \
 	  $(JAVAC) $(MEMORY_LIMIT) -g -d lib/rt -bootclasspath '' -source 1.6 \
-          -sourcepath 'generated:rt:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
+          -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \
           @$< ; \
         else \
 	  $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \
 	  -bootclasspath '' -source 1.6 \
-          -sourcepath 'generated:rt:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
+          -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \
           @$< ; \
         fi
 	cp -r $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources \
diff -r 837336085669 -r 62c48476a238 Makefile.in
--- a/Makefile.in	Tue May 27 20:24:02 2008 +0100
+++ b/Makefile.in	Tue May 27 20:26:21 2008 +0100
@@ -1275,12 +1275,12 @@ stamps/hotspot-tools-class-files.stamp: 
 	if ! test -f stamps/icedtea-ecj.stamp ; \
 	then \
 	  $(JAVAC) $(MEMORY_LIMIT) -g -d lib/hotspot-tools -bootclasspath '' -source 1.6 \
-	    -sourcepath 'rt:generated:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
+	    -sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
 	    @$< ; \
 	else \
 	  $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
 	    -bootclasspath '' -source 1.6 \
-            -sourcepath 'rt:generated:hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
+            -sourcepath 'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
             @$< ; \
 	fi
 	mkdir -p stamps
@@ -1314,19 +1314,19 @@ bootstrap/jdk1.7.0/jre/lib/tools.jar: st
 
 # rt-closed.jar class files.
 rt-source-files.txt: stamps/clone.stamp stamps/copy-source-files.stamp
-	find $(abs_top_srcdir)/rt rt -name '*.java' | sort > $@
+	find $(abs_top_srcdir)/rt -name '*.java' | sort > $@
 
 stamps/rt-class-files.stamp: rt-source-files.txt stamps/generated.stamp
 	mkdir -p lib/rt
 	if ! test -f stamps/icedtea-ecj.stamp ; \
         then \
 	  $(JAVAC) $(MEMORY_LIMIT) -g -d lib/rt -bootclasspath '' -source 1.6 \
-          -sourcepath 'generated:rt:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
+          -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \
           @$< ; \
         else \
 	  $(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \
 	  -bootclasspath '' -source 1.6 \
-          -sourcepath 'generated:rt:$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated:$(abs_top_srcdir)/rt' \
+          -sourcepath '$(OPENJDK_SOURCEPATH_DIRS):$(abs_top_srcdir)/generated' \
           @$< ; \
         fi
 	cp -r $(abs_top_srcdir)/rt/net/sourceforge/jnlp/resources \