changeset in /hg/icedtea6: 2008-03-04 Lillian Angel <langel at re...

[Lillian Angel]

changeset fbe341700451 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=fbe341700451
description:
	2008-03-04  Lillian Angel  <langel at redhat.com>

	        * Makefile.am: Removed gnu from tools.jar.
	        * Makefile.in: Regenerated.

diffstat:

3 files changed, 13 insertions(+), 8 deletions(-)
ChangeLog   |    5 +++++
Makefile.am |    8 ++++----
Makefile.in |    8 ++++----

diffs (72 lines):

diff -r 81e5f42991d2 -r fbe341700451 ChangeLog
--- a/ChangeLog	Tue Mar 04 21:54:12 2008 -0500
+++ b/ChangeLog	Tue Mar 04 21:57:56 2008 -0500
@@ -1,3 +1,8 @@ 2008-03-04  Lillian Angel  <langel at redha
+2008-03-04  Lillian Angel  <langel at redhat.com>
+
+	* Makefile.am: Removed gnu from tools.jar.
+	* Makefile.in: Regenerated.
+
 2008-03-04  Lillian Angel  <langel at redhat.com>
 
 	* rt/gnu/*: Removed.
diff -r 81e5f42991d2 -r fbe341700451 Makefile.am
--- a/Makefile.am	Tue Mar 04 21:54:12 2008 -0500
+++ b/Makefile.am	Tue Mar 04 21:57:56 2008 -0500
@@ -711,11 +711,11 @@ bootstrap/jdk1.7.0/jre/lib/tools.jar: st
 	if ! test -f stamps/icedtea-ecj.stamp ; \
         then \
     	  $(JAR) cf $@ -C lib/hotspot-tools com -C lib/hotspot-tools sun \
-	    -C lib/hotspot-tools org -C lib/hotspot-tools gnu -C lib/hotspot-tools java \
+	    -C lib/hotspot-tools org -C lib/hotspot-tools java \
 	    -C lib/hotspot-tools javax ; \
 	else \
 	  $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/hotspot-tools com -C lib/hotspot-tools sun \
-            -C lib/hotspot-tools org -C lib/hotspot-tools gnu -C lib/hotspot-tools java \
+            -C lib/hotspot-tools org -C lib/hotspot-tools java \
             -C lib/hotspot-tools javax ; \
 	fi
 	if test -d bootstrap/ecj ; \
@@ -757,10 +757,10 @@ bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
 	mkdir -p bootstrap/jdk1.7.0/jre/lib
 	if ! test -f stamps/icedtea-ecj.stamp ; \
         then \
-          $(JAR) cf $@ -C lib/rt com -C lib/rt gnu -C lib/rt java \
+          $(JAR) cf $@ -C lib/rt com -C lib/rt java \
           -C lib/rt javax -C lib/rt sun -C lib/rt org -C lib/rt net; \
 	else \
-          $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/rt com -C lib/rt gnu -C lib/rt java \
+          $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/rt com -C lib/rt java \
           -C lib/rt javax -C lib/rt sun -C lib/rt org -C lib/rt net; \
 	fi
 	if test -d bootstrap/ecj/jre/lib ; \
diff -r 81e5f42991d2 -r fbe341700451 Makefile.in
--- a/Makefile.in	Tue Mar 04 21:54:12 2008 -0500
+++ b/Makefile.in	Tue Mar 04 21:57:56 2008 -0500
@@ -1169,11 +1169,11 @@ bootstrap/jdk1.7.0/jre/lib/tools.jar: st
 	if ! test -f stamps/icedtea-ecj.stamp ; \
         then \
     	  $(JAR) cf $@ -C lib/hotspot-tools com -C lib/hotspot-tools sun \
-	    -C lib/hotspot-tools org -C lib/hotspot-tools gnu -C lib/hotspot-tools java \
+	    -C lib/hotspot-tools org -C lib/hotspot-tools java \
 	    -C lib/hotspot-tools javax ; \
 	else \
 	  $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/hotspot-tools com -C lib/hotspot-tools sun \
-            -C lib/hotspot-tools org -C lib/hotspot-tools gnu -C lib/hotspot-tools java \
+            -C lib/hotspot-tools org -C lib/hotspot-tools java \
             -C lib/hotspot-tools javax ; \
 	fi
 	if test -d bootstrap/ecj ; \
@@ -1215,10 +1215,10 @@ bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
 	mkdir -p bootstrap/jdk1.7.0/jre/lib
 	if ! test -f stamps/icedtea-ecj.stamp ; \
         then \
-          $(JAR) cf $@ -C lib/rt com -C lib/rt gnu -C lib/rt java \
+          $(JAR) cf $@ -C lib/rt com -C lib/rt java \
           -C lib/rt javax -C lib/rt sun -C lib/rt org -C lib/rt net; \
 	else \
-          $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/rt com -C lib/rt gnu -C lib/rt java \
+          $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/rt com -C lib/rt java \
           -C lib/rt javax -C lib/rt sun -C lib/rt org -C lib/rt net; \
 	fi
 	if test -d bootstrap/ecj/jre/lib ; \