Mercurial > hg > release > icedtea7-2.6

changeset 2029:9c96175dae62

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add missing plugin target and turn icedtea-*-stage2 into stamps. 2009-11-02 Andrew John Hughes <ahughes@redhat.com> * Makefile.am: (stamps/plugin.stamp): Added to unify two plugin targets. (stamps/icedtea-stage2.stamp): Renamed from icedtea-stage2 so we can mark when its done. (stamps/icedtea-debug-stage2.stamp): Likewise with icedtea-debug-stage2. (clean-icedtea-stage2): Inverse target for icedtea-stage2. (clean-icedtea-debug-stage2): Same for icedtea-debug-stage2.
author Andrew John Hughes <ahughes@redhat.com>
date Mon, 02 Nov 2009 21:43:32 +0000
parents 73b1d535e19b
children ce2937846cc0
files ChangeLog Makefile.am
diffstat 2 files changed, 38 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Nov 02 19:55:03 2009 +0000
+++ b/ChangeLog	Mon Nov 02 21:43:32 2009 +0000
@@ -1,3 +1,18 @@
+2009-11-02  Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am:
+	(stamps/plugin.stamp): Added to unify
+	two plugin targets.
+	(stamps/icedtea-stage2.stamp): Renamed
+	from icedtea-stage2 so we can mark when 
+	its done.
+	(stamps/icedtea-debug-stage2.stamp): Likewise
+	with icedtea-debug-stage2.
+	(clean-icedtea-stage2): Inverse target for
+	icedtea-stage2.
+	(clean-icedtea-debug-stage2): Same for
+	icedtea-debug-stage2.
+	
 2009-11-02  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
--- a/Makefile.am	Mon Nov 02 19:55:03 2009 +0000
+++ b/Makefile.am	Mon Nov 02 21:43:32 2009 +0000
@@ -700,7 +700,8 @@
  clean-visualvm clean-nbplatform clean-bootstrap-directory-stage1 \
  clean-bootstrap-directory-stage2 clean-bootstrap-directory-symlink-stage1 \
  clean-bootstrap-directory-symlink-stage2 clean-extract clean-generated \
- clean-plugin clean-liveconnect clean-native-ecj clean-hgforest
+ clean-plugin clean-liveconnect clean-native-ecj clean-hgforest \
+ clean-icedtea-stage2 clean-icedtea-debug-stage2
 	if [ -e bootstrap ]; then \
 	  rmdir bootstrap ; \
 	fi
@@ -1840,17 +1841,22 @@
 	  -C openjdk/make clobber
 	rm -f stamps/icedtea.stamp stamps/icedtea-debug.stamp
 
-icedtea-stage2: \
-	stamps/icedtea.stamp \
-	stamps/add-cacao.stamp \
-	stamps/add-zero.stamp \
-	stamps/visualvm.stamp
+stamps/icedtea-stage2.stamp: stamps/icedtea.stamp stamps/add-cacao.stamp \
+ stamps/add-zero.stamp stamps/visualvm.stamp
+	mkdir -p stamps
+	touch $@
+
+clean-icedtea-stage2:
+	rm -f stamps/icedtea-stage2.stamp
 
-icedtea-debug-stage2: \
-	stamps/icedtea-debug.stamp \
-	stamps/add-cacao-debug.stamp \
-	stamps/add-zero-debug.stamp \
-	stamps/visualvm.stamp
+stamps/icedtea-debug-stage2.stamp: stamps/icedtea-debug.stamp \
+ stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp \
+ stamps/visualvm.stamp
+	mkdir -p stamps
+	touch $@
+
+clean-icedtea-debug-stage2:
+	rm -f stamps/icedtea-debug-stage2.stamp
 
 # OpenJDK boot Targets
 # ===================
@@ -1976,6 +1982,10 @@
 	rm -f IcedTeaPlugin.so
 endif
 
+stamps/plugin.stamp: $(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET)
+	mkdir -p stamps
+	touch $@
+
 clean-plugin: $(ICEDTEAPLUGIN_CLEAN) $(ICEDTEANPPLUGIN_CLEAN)
 
 stamps/liveconnect.stamp: stamps/rt-class-files.stamp
@@ -2543,6 +2553,8 @@
 
 icedtea-debug: stamps/icedtea-debug.stamp
 
+icedtea-debug-stage2: stamps/icedtea-debug-stage2.stamp
+
 icedtea-stage1: stamps/icedtea-stage1.stamp
 
 icedtea-stage2: stamps/icedtea-stage2.stamp