changeset in /hg/icedtea: 2007-09-13 Andrew Haley <aph at redhat....

[Andrew Haley]

changeset 07bdae5a04b5 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=07bdae5a04b5
description:
	2007-09-13  Andrew Haley  <aph at redhat.com>

	        * Makefile.am (icedtea-debug): Correct dependencies.

diffstat:

3 files changed, 14 insertions(+), 6 deletions(-)
ChangeLog   |    4 ++++
Makefile.am |    8 +++++---
Makefile.in |    8 +++++---

diffs (78 lines):

diff -r fc74f1dfdfab -r 07bdae5a04b5 ChangeLog
--- a/ChangeLog	Thu Sep 13 00:15:40 2007 -0400
+++ b/ChangeLog	Thu Sep 13 15:11:28 2007 +0100
@@ -20,6 +20,10 @@ 2007-09-13  Christan Thalinger  <twisti@
 2007-09-13  Christan Thalinger  <twisti at complang.tuwien.ac.at>
 
 	* patches/icedtea-cacao-instrument-Makefile.patch: New file.
+
+2007-09-13  Andrew Haley  <aph at redhat.com>
+
+	* Makefile.am (icedtea-debug): Correct dependencies.
 
 2007-09-13  Lillian Angel  <langel at redhat.com>
 
diff -r fc74f1dfdfab -r 07bdae5a04b5 Makefile.am
--- a/Makefile.am	Thu Sep 13 00:15:40 2007 -0400
+++ b/Makefile.am	Thu Sep 13 15:11:28 2007 +0100
@@ -365,6 +365,8 @@ else
   MEMORY_LIMIT =
 endif
 
+# If you change anything here in the icedtea target, please make sure
+# you change it in the icedtea-debug target as well.
 icedtea: stamps/tools.stamp stamps/plugs.stamp stamps/extract.stamp \
 	stamps/patch.stamp gcjwebplugin.so
 	$(MAKE) \
@@ -376,8 +378,8 @@ icedtea: stamps/tools.stamp stamps/plugs
 	  openjdk/control/build/$(LINUX_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
 	@echo "IcedTea is served:" openjdk/control/build/$(LINUX_DIR)
 
-icedtea-debug: stamps/bootstrap-directory-symlink-ecj.stamp stamps/tools.stamp \
-	 stamps/plugs.stamp stamps/extract.stamp \
+icedtea-debug: 	stamps/bootstrap-directory-symlink.stamp \
+	stamps/tools.stamp stamps/plugs.stamp stamps/extract.stamp \
 	stamps/patch.stamp gcjwebplugin.so
 	$(MAKE) \
 	  $(ICEDTEA_ENV) \
@@ -387,7 +389,7 @@ icedtea-debug: stamps/bootstrap-director
 	  openjdk/control/build/$(LINUX_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
 	cp -af gcjwebplugin.so \
 	  openjdk/control/build/$(LINUX_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR)
-	@echo "Debug-flavoured IcedTea is served:" \
+	@echo "IcedTea (debug build) is served:" \
 	  openjdk/control/build/$(LINUX_DIR)-debug
 
 clean-icedtea: stamps/extract.stamp
diff -r fc74f1dfdfab -r 07bdae5a04b5 Makefile.in
--- a/Makefile.in	Thu Sep 13 00:15:40 2007 -0400
+++ b/Makefile.in	Thu Sep 13 15:11:28 2007 +0100
@@ -828,6 +828,8 @@ clean-bootstrap-directory-symlink-ecj:
 	rm -f stamps/bootstrap-directory-symlink-ecj.stamp
 	rm -f bootstrap/jdk1.6.0
 
+# If you change anything here in the icedtea target, please make sure
+# you change it in the icedtea-debug target as well.
 icedtea: stamps/tools.stamp stamps/plugs.stamp stamps/extract.stamp \
 	stamps/patch.stamp gcjwebplugin.so
 	$(MAKE) \
@@ -839,8 +841,8 @@ icedtea: stamps/tools.stamp stamps/plugs
 	  openjdk/control/build/$(LINUX_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
 	@echo "IcedTea is served:" openjdk/control/build/$(LINUX_DIR)
 
-icedtea-debug: stamps/bootstrap-directory-symlink-ecj.stamp stamps/tools.stamp \
-	 stamps/plugs.stamp stamps/extract.stamp \
+icedtea-debug: 	stamps/bootstrap-directory-symlink.stamp \
+	stamps/tools.stamp stamps/plugs.stamp stamps/extract.stamp \
 	stamps/patch.stamp gcjwebplugin.so
 	$(MAKE) \
 	  $(ICEDTEA_ENV) \
@@ -850,7 +852,7 @@ icedtea-debug: stamps/bootstrap-director
 	  openjdk/control/build/$(LINUX_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
 	cp -af gcjwebplugin.so \
 	  openjdk/control/build/$(LINUX_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR)
-	@echo "Debug-flavoured IcedTea is served:" \
+	@echo "IcedTea (debug build) is served:" \
 	  openjdk/control/build/$(LINUX_DIR)-debug
 
 clean-icedtea: stamps/extract.stamp