changeset in /hg/icedtea: 2007-11-12 Lillian Angel <langel at red...

[Lillian Angel]

changeset c74a9113a051 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c74a9113a051
description:
	2007-11-12  Lillian Angel  <langel at redhat.com>

	        * Makefile.am: Fixed tools.jar and rt.jar to include all directories
	        built under lib/.
	        * Makefile.in: Regenerated.

diffstat:

3 files changed, 12 insertions(+), 4 deletions(-)
ChangeLog   |    6 ++++++
Makefile.am |    5 +++--
Makefile.in |    5 +++--

diffs (57 lines):

diff -r 148446a640b3 -r c74a9113a051 ChangeLog
--- a/ChangeLog	Mon Nov 12 13:49:44 2007 -0500
+++ b/ChangeLog	Mon Nov 12 15:30:32 2007 -0500
@@ -1,3 +1,9 @@ 2007-11-12  Lillian Angel  <langel at redha
+2007-11-12  Lillian Angel  <langel at redhat.com>
+
+	* Makefile.am: Fixed tools.jar and rt.jar to include all directories
+	built under lib/.
+	* Makefile.in: Regenerated.
+
 2007-11-12  Lillian Angel  <langel at redhat.com>
 
 	* .hgignore: Updated
diff -r 148446a640b3 -r c74a9113a051 Makefile.am
--- a/Makefile.am	Mon Nov 12 13:49:44 2007 -0500
+++ b/Makefile.am	Mon Nov 12 15:30:32 2007 -0500
@@ -614,7 +614,8 @@ bootstrap/jdk1.7.0/jre/lib/tools.jar: st
 bootstrap/jdk1.7.0/jre/lib/tools.jar: stamps/tools-class-files.stamp
 	mkdir -p bootstrap/jdk1.7.0/jre/lib/
 	$(JAR) cf $@ -C lib/tools com -C lib/tools sun \
-	  -C lib/tools org
+	  -C lib/tools org -C lib/tools gnu -C lib/tools java \
+	  -C lib/tools javax
 	if test -d bootstrap/ecj ; \
 	then \
 	  mkdir -p bootstrap/ecj/lib/; \
@@ -643,7 +644,7 @@ bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
 bootstrap/jdk1.7.0/jre/lib/rt-closed.jar: stamps/rt-class-files.stamp
 	mkdir -p bootstrap/jdk1.7.0/jre/lib
 	$(JAR) cf $@ -C lib/rt com -C lib/rt gnu -C lib/rt java \
-	  -C lib/rt javax -C lib/rt sun
+	  -C lib/rt javax -C lib/rt sun -C lib/rt org
 	if test -d bootstrap/ecj/jre/lib ; \
 	then \
 	  cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar bootstrap/ecj/jre/lib/rt.jar; \
diff -r 148446a640b3 -r c74a9113a051 Makefile.in
--- a/Makefile.in	Mon Nov 12 13:49:44 2007 -0500
+++ b/Makefile.in	Mon Nov 12 15:30:32 2007 -0500
@@ -994,7 +994,8 @@ bootstrap/jdk1.7.0/jre/lib/tools.jar: st
 bootstrap/jdk1.7.0/jre/lib/tools.jar: stamps/tools-class-files.stamp
 	mkdir -p bootstrap/jdk1.7.0/jre/lib/
 	$(JAR) cf $@ -C lib/tools com -C lib/tools sun \
-	  -C lib/tools org
+	  -C lib/tools org -C lib/tools gnu -C lib/tools java \
+	  -C lib/tools javax
 	if test -d bootstrap/ecj ; \
 	then \
 	  mkdir -p bootstrap/ecj/lib/; \
@@ -1023,7 +1024,7 @@ bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
 bootstrap/jdk1.7.0/jre/lib/rt-closed.jar: stamps/rt-class-files.stamp
 	mkdir -p bootstrap/jdk1.7.0/jre/lib
 	$(JAR) cf $@ -C lib/rt com -C lib/rt gnu -C lib/rt java \
-	  -C lib/rt javax -C lib/rt sun
+	  -C lib/rt javax -C lib/rt sun -C lib/rt org
 	if test -d bootstrap/ecj/jre/lib ; \
 	then \
 	  cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar bootstrap/ecj/jre/lib/rt.jar; \