Mercurial > hg > release > icedtea6-1.4.1

changeset 347:a82c7471e590

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2007-11-12 Lillian Angel <langel@redhat.com> * Makefile.am: Fixed tools.jar and rt.jar to include all directories built under lib/. * Makefile.in: Regenerated.
author Lillian Angel <langel@redhat.com>
date Mon, 12 Nov 2007 15:30:32 -0500
parents 8eeff03f776d
children be4f18fe7da6
files ChangeLog Makefile.am Makefile.in
diffstat 3 files changed, 12 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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@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@redhat.com>
 
 	* .hgignore: Updated
--- a/Makefile.am	Mon Nov 12 13:49:44 2007 -0500
+++ b/Makefile.am	Mon Nov 12 15:30:32 2007 -0500
@@ -590,7 +590,8 @@
 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/; \
@@ -619,7 +620,7 @@
 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; \
--- a/Makefile.in	Mon Nov 12 13:49:44 2007 -0500
+++ b/Makefile.in	Mon Nov 12 15:30:32 2007 -0500
@@ -1043,7 +1043,8 @@
 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/; \
@@ -1072,7 +1073,7 @@
 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; \