--- a/ChangeLog	Wed Jul 22 15:22:58 2015 +0100
+++ b/ChangeLog	Wed Jul 22 15:52:21 2015 +0100
@@ -1,3 +1,23 @@
+2015-07-22  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	PR2360: Ensure all stamp targets have aliases
+	* Makefile.am:
+	Add missing aliases for add-cacao,
+	add-cacao-debug, add-jamvm, add-jamvm-debug,
+	add-nss, add-nss-debug, add-nss-ecj,
+	add-pulseaudio, add-pulseaudio-debug,
+	add-pulseaudio-ecj, add-systemtap,
+	add-systemtap-debug, add-systemtap-ecj,
+	add-tzdata-support, add-tzdata-support-debug,
+	add-tzdata-support-ecj, add-zero, add-zero-debug,
+	extract-openjdk, fonts, generated, hgforest,
+	ports, pulse-java, pulse-java-class,
+	pulse-java-headers, pulse-java-jar,
+	remove-intree-libraries, runnable-icedtea,
+	runnable-icedtea-debug and runnable-icedtea-ecj.
+	Remove dead nbplatform and rename rt-jar to rt.
+	* NEWS: Updated.
+
 2015-07-06  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	PR2342: Update README & INSTALL files

--- a/Makefile.am	Wed Jul 22 15:22:58 2015 +0100
+++ b/Makefile.am	Wed Jul 22 15:52:21 2015 +0100
@@ -2907,6 +2907,42 @@
 
 add-archive-ecj: stamps/add-archive-ecj.stamp
 
+add-cacao: stamps/add-cacao.stamp
+
+add-cacao-debug: stamps/add-cacao-debug.stamp
+
+add-jamvm: stamps/add-jamvm.stamp
+
+add-jamvm-debug: stamps/add-jamvm-debug.stamp
+
+add-nss: stamps/add-nss.stamp
+
+add-nss-debug: stamps/add-nss-debug.stamp
+
+add-nss-ecj: stamps/add-nss-ecj.stamp
+
+add-pulseaudio: stamps/add-pulseaudio.stamp
+
+add-pulseaudio-debug: stamps/add-pulseaudio-debug.stamp
+
+add-pulseaudio-ecj: stamps/add-pulseaudio-ecj.stamp
+
+add-systemtap: stamps/add-systemtap.stamp
+
+add-systemtap-debug: stamps/add-systemtap-debug.stamp
+
+add-systemtap-ecj: stamps/add-systemtap-ecj.stamp
+
+add-tzdata-support: stamps/add-tzdata-support.stamp
+
+add-tzdata-support-debug: stamps/add-tzdata-support-debug.stamp
+
+add-tzdata-support-ecj: stamps/add-tzdata-support-ecj.stamp
+
+add-zero: stamps/add-zero.stamp
+
+add-zero-debug: stamps/add-zero-debug.stamp
+
 bootstrap-directory-ecj: stamps/bootstrap-directory-ecj.stamp
 
 bootstrap-directory: stamps/bootstrap-directory.stamp
@@ -2925,8 +2961,6 @@
 
 cryptocheck: stamps/cryptocheck.stamp
 
-nbplatform: stamps/nbplatform.stamp
-
 download: stamps/download.stamp
 
 download-cacao: stamps/download-cacao.stamp
@@ -2945,6 +2979,14 @@
 
 extract-jamvm: stamps/extract-jamvm.stamp
 
+extract-openjdk: stamps/extract-openjdk.stamp
+
+fonts: stamps/fonts.stamp
+
+generated: stamps/generated.stamp
+
+hgforest: stamps/hgforest.stamp
+
 hotspot-ports: stamps/ports.stamp
 
 icedtea: stamps/icedtea.stamp
@@ -2983,16 +3025,32 @@
 
 pax-mark-vm-ecj: stamps/pax-mark-vm-ecj.stamp
 
+ports: stamps/ports.stamp
+
 pulse-java: stamps/pulse-java.stamp
 
+pulse-java-class: stamps/pulse-java-class.stamp
+
+pulse-java-headers: stamps/pulse-java-headers.stamp
+
+pulse-java-jar: stamps/pulse-java-jar.stamp
+
+remove-intree-libraries: stamps/remove-intree-libraries.stamp
+
 rewriter: stamps/rewriter.stamp
 
 rewrite-rhino: stamps/rewrite-rhino.stamp
 
 replace-hotspot: stamps/replace-hotspot.stamp
 
-rt-jar: stamps/rt.stamp
+rt: stamps/rt.stamp
 
 rt-class-files: stamps/rt-class-files.stamp
 
+runnable-icedtea: stamps/runnable-icedtea.stamp
+
+runnable-icedtea-debug: stamps/runnable-icedtea-debug.stamp
+
+runnable-icedtea-ecj: stamps/runnable-icedtea-ecj.stamp
+
 tools-jar: stamps/tools.stamp

--- a/NEWS	Wed Jul 22 15:22:58 2015 +0100
+++ b/NEWS	Wed Jul 22 15:52:21 2015 +0100
@@ -58,6 +58,7 @@
   - PR2319: Checksum of policy JAR files changes on every build
   - PR2340: Fail early if there is no native HotSpot JIT & all other options are disabled
   - PR2342: Update README & INSTALL files
+  - PR2360: Ensure all stamp targets have aliases
   - PR2460: Policy JAR files should be timestamped with the date of the policy file they hold
   - PR2481, RH489586, RH1236619: OpenJDK can't handle spaces in zone names in /etc/sysconfig/clock
   - PR2486: JSSE server is still limited to 768-bit DHE