changeset 262:07bdae5a04b5 cacao

2007-09-13 Andrew Haley <aph@redhat.com> * Makefile.am (icedtea-debug): Correct dependencies.
author Andrew Haley <aph@redhat.com>
date Thu, 13 Sep 2007 15:11:28 +0100
parents fc74f1dfdfab
children 9a2c46b3ad60
files ChangeLog Makefile.am Makefile.in
diffstat 3 files changed, 14 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Sep 13 00:15:40 2007 -0400
+++ b/ChangeLog	Thu Sep 13 15:11:28 2007 +0100
@@ -21,6 +21,10 @@
 
 	* patches/icedtea-cacao-instrument-Makefile.patch: New file.
 
+2007-09-13  Andrew Haley  <aph@redhat.com>
+
+	* Makefile.am (icedtea-debug): Correct dependencies.
+
 2007-09-13  Lillian Angel  <langel@redhat.com>
 
 	* Makefile.am: Fixed target typo.
--- 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 @@
   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 @@
 	  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 @@
 	  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
--- 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 @@
 	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 @@
 	  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 @@
 	  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