Make icedtea-debug work again

[Andrew Haley]

This fixes the icedtea-debug target.  I think the only thing wrong was
the dependencies: we were depending on
stamps/bootstrap-directory-symlink-ecj.stamp instead of
stamps/bootstrap-directory-symlink.stamp, so we were trying to build
openjdk with ecj, but without the necessary ecj patches.

I'm still testing this.

Andrew.


2007-09-13  Andrew Haley  <aph at redhat.com>

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

diff -r d312ad01f249 Makefile.am
--- a/Makefile.am	Thu Sep 13 00:15:40 2007 -0400
+++ b/Makefile.am	Thu Sep 13 14:16:26 2007 +0100
@@ -341,6 +341,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) \
@@ -352,8 +354,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) \
@@ -363,7 +365,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

-- 
Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, UK
Registered in England and Wales No. 3798903