changeset in /hg/icedtea6: Add two missing cacao dependencies.

[Mark Wielaard]

changeset e81b34d95ce6 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e81b34d95ce6
description:
	Add two missing cacao dependencies.

	2008-06-29  Mark Wielaard  <mark at klomp.org>

		* Makefile.am (stamps/icedtea-ecj.stamp): Add dependency on
		stamps/cacao.stamp.
		(stamps/cacao.stamp): Add dependency on stamps/rt-class-files.stamp.
		* Makefile.in: Regenerated.

diffstat:

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

diffs (56 lines):

diff -r 1558950ab7d9 -r e81b34d95ce6 ChangeLog
--- a/ChangeLog	Sun Jun 29 14:49:43 2008 +0200
+++ b/ChangeLog	Sun Jun 29 21:31:52 2008 +0200
@@ -1,3 +1,10 @@ 2008-06-27  Joshua Sumali  <jsumali at redh
+2008-06-29  Mark Wielaard  <mark at klomp.org>
+
+	* Makefile.am (stamps/icedtea-ecj.stamp): Add dependency on
+	stamps/cacao.stamp.
+	(stamps/cacao.stamp): Add dependency on stamps/rt-class-files.stamp.
+	* Makefile.in: Regenerated.
+
 2008-06-27  Joshua Sumali  <jsumali at redhat.com>
 
 	* rt/net/sourceforge/jnlp/services/XPersistenceService.java: Throw a
diff -r 1558950ab7d9 -r e81b34d95ce6 Makefile.am
--- a/Makefile.am	Sun Jun 29 14:49:43 2008 +0200
+++ b/Makefile.am	Sun Jun 29 21:31:52 2008 +0200
@@ -723,7 +723,7 @@ icedtea-against-icedtea: \
 # ===================
 
 stamps/icedtea-ecj.stamp: stamps/hotspot-tools.stamp stamps/plugs.stamp \
-	stamps/ports-ecj.stamp stamps/patch-ecj.stamp
+	stamps/ports-ecj.stamp stamps/patch-ecj.stamp stamps/cacao.stamp
 	$(MAKE) \
 	  $(ICEDTEA_ENV_ECJ) \
 	  -C openjdk-ecj/control/make \
@@ -985,7 +985,7 @@ extra-lib/about.jar: stamps/extra-class-
 	  $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C extra-lib net ; \
 	fi
 
-stamps/cacao.stamp: stamps/extract.stamp
+stamps/cacao.stamp: stamps/extract.stamp stamps/rt-class-files.stamp
 if !USE_SYSTEM_CACAO
 	cd cacao/cacao-$(CACAO_VERSION) ; \
 	./configure \
diff -r 1558950ab7d9 -r e81b34d95ce6 Makefile.in
--- a/Makefile.in	Sun Jun 29 14:49:43 2008 +0200
+++ b/Makefile.in	Sun Jun 29 21:31:52 2008 +0200
@@ -1167,7 +1167,7 @@ icedtea-against-icedtea: \
 # ===================
 
 stamps/icedtea-ecj.stamp: stamps/hotspot-tools.stamp stamps/plugs.stamp \
-	stamps/ports-ecj.stamp stamps/patch-ecj.stamp
+	stamps/ports-ecj.stamp stamps/patch-ecj.stamp stamps/cacao.stamp
 	$(MAKE) \
 	  $(ICEDTEA_ENV_ECJ) \
 	  -C openjdk-ecj/control/make \
@@ -1404,7 +1404,7 @@ extra-lib/about.jar: stamps/extra-class-
 	  $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C extra-lib net ; \
 	fi
 
-stamps/cacao.stamp: stamps/extract.stamp
+stamps/cacao.stamp: stamps/extract.stamp stamps/rt-class-files.stamp
 @USE_SYSTEM_CACAO_FALSE@	cd cacao/cacao-$(CACAO_VERSION) ; \
 @USE_SYSTEM_CACAO_FALSE@	./configure \
 @USE_SYSTEM_CACAO_FALSE@	  --prefix=$(abs_top_srcdir)/cacao/install \