changeset in /hg/icedtea: 2008-02-28 Lillian Angel <langel at red...

[Lillian Angel]

changeset 9e291f9ed647 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9e291f9ed647
description:
	2008-02-28  Lillian Angel  <langel at redhat.com>

	        * Makefile.am
	        (stamps/default-jnlp.stamp): Added dependency.
	        (stamps/icedtea-compile.stamp): Removed touch at end of rule. Should
	        follow what the comment says.
	        (stamps/icedtea-compile-ecj.stamp): Likewise.
	        (icedtea-compile): Added new alias target.
	        (icedtea-compile-ecj): Likewise.
	        * Makefile.in: Regenerated.

diffstat:

3 files changed, 21 insertions(+), 12 deletions(-)
ChangeLog   |   11 +++++++++++
Makefile.am |   11 +++++------
Makefile.in |   11 +++++------

diffs (99 lines):

diff -r b621e35b65fe -r 9e291f9ed647 ChangeLog
--- a/ChangeLog	Thu Feb 28 10:54:51 2008 +0100
+++ b/ChangeLog	Thu Feb 28 10:05:40 2008 -0500
@@ -1,3 +1,14 @@ 2008-02-28  Mark Wielaard  <mwielaard at re
+2008-02-28  Lillian Angel  <langel at redhat.com>
+
+	* Makefile.am
+	(stamps/default-jnlp.stamp): Added dependency.
+	(stamps/icedtea-compile.stamp): Removed touch at end of rule. Should
+	follow what the comment says.
+	(stamps/icedtea-compile-ecj.stamp): Likewise.
+	(icedtea-compile): Added new alias target.
+	(icedtea-compile-ecj): Likewise.
+	* Makefile.in: Regenerated.
+
 2008-02-28  Mark Wielaard  <mwielaard at redhat.com>
 
 	* Makefile.am (EXTRA_DIST): Removed tools and icedtea-plugin.patch.
diff -r b621e35b65fe -r 9e291f9ed647 Makefile.am
--- a/Makefile.am	Thu Feb 28 10:54:51 2008 +0100
+++ b/Makefile.am	Thu Feb 28 10:05:40 2008 -0500
@@ -524,8 +524,6 @@ if ENABLE_PLUGIN
 	  $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
 endif
 endif
-	touch stamps/icedtea-compile.stamp
-	@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
 
 icedtea-debug: stamps/icedtea-compile-debug.stamp
 	@echo "IcedTea (debug build) is served:" \
@@ -555,9 +553,6 @@ if ENABLE_PLUGIN
 	  $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR)
 endif
 endif
-	touch stamps/icedtea-compile-debug.stamp
-	@echo "IcedTea (debug build) is served:" \
-	  $(BUILD_OUTPUT_DIR)-debug
 
 clean-icedtea: stamps/clone.stamp
 	$(MAKE) \
@@ -842,7 +837,7 @@ endif
 endif
 endif
 
-stamps/default-jnlp.stamp:
+stamps/default-jnlp.stamp: stamps/icedtea-compile.stamp
 	cp rt/net/sourceforge/jnlp/resources/default.jnlp \
 	  $(BUILD_OUTPUT_DIR)/j2re-image/lib
 	cp rt/net/sourceforge/jnlp/resources/default.jnlp \
@@ -891,3 +886,7 @@ ports-ecj: stamps/ports-ecj.stamp
 ports-ecj: stamps/ports-ecj.stamp
 
 clean: distclean-local
+
+icedtea-compile: stamps/icedtea-compile.stamp
+
+icedtea-compile-ecj: stamps/icedtea-compile-ecj.stamp
diff -r b621e35b65fe -r 9e291f9ed647 Makefile.in
--- a/Makefile.in	Thu Feb 28 10:54:51 2008 +0100
+++ b/Makefile.in	Thu Feb 28 10:05:40 2008 -0500
@@ -999,8 +999,6 @@ stamps/icedtea-compile.stamp: stamps/boo
 @ENABLE_LIVECONNECT_FALSE@@ENABLE_PLUGIN_TRUE@	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
 @ENABLE_LIVECONNECT_FALSE@@ENABLE_PLUGIN_TRUE@	cp -pPRf gcjwebplugin.so \
 @ENABLE_LIVECONNECT_FALSE@@ENABLE_PLUGIN_TRUE@	  $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
-	touch stamps/icedtea-compile.stamp
-	@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
 
 icedtea-debug: stamps/icedtea-compile-debug.stamp
 	@echo "IcedTea (debug build) is served:" \
@@ -1025,9 +1023,6 @@ stamps/icedtea-compile-debug.stamp: stam
 @ENABLE_LIVECONNECT_FALSE@@ENABLE_PLUGIN_TRUE@	  $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
 @ENABLE_LIVECONNECT_FALSE@@ENABLE_PLUGIN_TRUE@	cp -pPRf gcjwebplugin.so \
 @ENABLE_LIVECONNECT_FALSE@@ENABLE_PLUGIN_TRUE@	  $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR)
-	touch stamps/icedtea-compile-debug.stamp
-	@echo "IcedTea (debug build) is served:" \
-	  $(BUILD_OUTPUT_DIR)-debug
 
 clean-icedtea: stamps/clone.stamp
 	$(MAKE) \
@@ -1279,7 +1274,7 @@ bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
 @ENABLE_LIVECONNECT_FALSE@@ENABLE_PLUGIN_TRUE at clean-gcjwebplugin:
 @ENABLE_LIVECONNECT_FALSE@@ENABLE_PLUGIN_TRUE@	rm -f gcjwebplugin.so
 
-stamps/default-jnlp.stamp:
+stamps/default-jnlp.stamp: stamps/icedtea-compile.stamp
 	cp rt/net/sourceforge/jnlp/resources/default.jnlp \
 	  $(BUILD_OUTPUT_DIR)/j2re-image/lib
 	cp rt/net/sourceforge/jnlp/resources/default.jnlp \
@@ -1328,6 +1323,10 @@ ports-ecj: stamps/ports-ecj.stamp
 ports-ecj: stamps/ports-ecj.stamp
 
 clean: distclean-local
+
+icedtea-compile: stamps/icedtea-compile.stamp
+
+icedtea-compile-ecj: stamps/icedtea-compile-ecj.stamp
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: