--- a/ChangeLog	Mon Mar 01 16:05:43 2010 +0000
+++ b/ChangeLog	Mon Mar 01 19:05:45 2010 +0000
@@ -1,3 +1,24 @@
+2010-03-01  Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am:
+	(icedtea-against-icedtea): Convert to stamp
+	and provide this as an alias.
+	(icedtea-debug-against-icedtea): Likewise.
+	(stamps/jtreg.stamp): Depend on
+	stamps/icedtea-against-icedtea.stamp
+	(stamps/tools.stamp): Converted from
+	target relying on
+	bootstrap/jdk1.7.0/jre/lib/tools.jar to
+	a stamp target.
+	(clean-tools-jar): Remove the stamp.
+	(stamps/plugs.stamp): Depend on tools.stamp
+	not the jar file itself.
+	(icedtea): Match icedtea.stamp without bringing in
+	additional dependencies.  icedtea-against-icedtea
+	is equivalent to the old version.
+	(icedtea-debug): Likewise.
+	(tools-jar): New alias for tools.stamp
+
 2010-03-01  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:

--- a/Makefile.am	Mon Mar 01 16:05:43 2010 +0000
+++ b/Makefile.am	Mon Mar 01 19:05:45 2010 +0000
@@ -1536,19 +1536,17 @@
 	  -C openjdk clobber
 	rm -f stamps/icedtea.stamp stamps/icedtea-debug.stamp
 
-icedtea-against-icedtea: \
-	stamps/bootstrap-directory-symlink.stamp \
-	stamps/icedtea.stamp \
-	stamps/add-cacao.stamp \
-	stamps/add-zero.stamp
+stamps/icedtea-against-icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \
+ stamps/icedtea.stamp stamps/add-cacao.stamp stamps/add-zero.stamp
+	mkdir -p stamps
+	touch stamps/icedtea-against-icedtea.stamp
 
 #FIXME (clean): Missing clean-icedtea-against-icedtea
 
-icedtea-debug-against-icedtea: \
-	stamps/bootstrap-directory-symlink.stamp \
-	stamps/icedtea-debug.stamp \
-	stamps/add-cacao-debug.stamp \
-	stamps/add-zero-debug.stamp
+stamps/icedtea-debug-against-icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \
+ stamps/icedtea-debug.stamp stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp
+	mkdir -p stamps
+	touch stamps/icedtea-debug-against-icedtea.stamp
 
 #FIXME (clean): Missing clean-icedtea-debug-against-icedtea
 
@@ -2040,7 +2038,7 @@
 
 # jtreg
 
-stamps/jtreg.stamp: stamps/icedtea.stamp stamps/add-zero.stamp stamps/add-cacao.stamp
+stamps/jtreg.stamp: stamps/icedtea-against-icedtea.stamp
 	rm -rf test/jtreg/classes
 	mkdir -p test/jtreg/classes
 	$(ICEDTEA_BOOT_DIR)/bin/javac -g -d test/jtreg/classes -source 1.5 \
@@ -2171,7 +2169,7 @@
 	touch stamps/rt.stamp
 
 # tools.jar
-bootstrap/jdk1.7.0/jre/lib/tools.jar: 
+stamps/tools.stamp:
 	mkdir -p bootstrap/jdk1.7.0/jre/lib/
 	ln -sf $(ICEDTEA_RT) $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar
 	if test -d bootstrap/ecj ; \
@@ -2180,15 +2178,18 @@
 	  ln -sf $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \
 	    $(abs_top_builddir)/bootstrap/ecj/lib/tools.jar; \
 	fi
+	mkdir -p stamps
+	touch stamps/tools.stamp
 
 clean-tools-jar: 
 	rm -f bootstrap/jdk1.7.0/jre/lib/tools.jar
 	if test -d bootstrap/ecj/lib ; then \
 	  rm -f $(abs_top_builddir)/bootstrap/ecj/lib/tools.jar; \
 	fi
+	rm -f stamps/tools.stamp
 
 # rt-closed.jar
-stamps/plugs.stamp: stamps/rt.stamp bootstrap/jdk1.7.0/jre/lib/tools.jar
+stamps/plugs.stamp: stamps/rt.stamp stamps/tools.stamp
 	$(ICEDTEA_BOOT_DIR)/bin/jar cf $(ICEDTEA_PLUGS) \
 	  -C lib/rt com/sun/jmx/snmp $(LIVECONNECT_DIR) \
 	  -C lib/rt net -C lib/rt javax/jnlp ;
@@ -2233,11 +2234,15 @@
 
 hotspot-ports: stamps/ports.stamp
 
-icedtea: stamps/icedtea.stamp stamps/add-cacao.stamp stamps/add-zero.stamp
+icedtea: stamps/icedtea.stamp
+
+icedtea-against-icedtea: stamps/icedtea-against-icedtea.stamp
 
 icedtea-against-ecj: stamps/icedtea-against-ecj.stamp
 
-icedtea-debug: stamps/icedtea-debug.stamp stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp
+icedtea-debug: stamps/icedtea-debug.stamp
+
+icedtea-debug-against-icedtea: stamps/icedtea-debug-against-icedtea.stamp
 
 icedtea-ecj: stamps/icedtea-ecj.stamp
 
@@ -2271,4 +2276,6 @@
 
 rt-class-files: stamps/rt-class-files.stamp
 
+tools-jar: stamps/tools.stamp
+
 visualvm: stamps/visualvm.stamp