Mercurial > hg > release > icedtea6-1.11
changeset 1928:40c6a61591e5
2010-02-20 Matthias Klose <doko@ubuntu.com>
* Makefile.am (stamps/icedtea.stamp, stamps/icedtea-debug.stamp):
Depend on stamps/plugin.stamp instead of $(ICEDTEAPLUGIN_TARGET)
and $(ICEDTEANPPLUGIN_TARGET).
(icedtea): Depend on stamps/add-zero.stamp and stamps/add-cacao.stamp
(icedtea-debug): Depend on stamps/add-cacao-debug.stamp and
stamps/add-zero-debug.stamp.
author | doko@ubuntu.com |
---|---|
date | Sat, 20 Feb 2010 21:35:37 +0100 |
parents | 546bafa175f1 |
children | ede5e9311ef4 |
files | ChangeLog Makefile.am |
diffstat | 2 files changed, 16 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Feb 19 20:25:47 2010 +0100 +++ b/ChangeLog Sat Feb 20 21:35:37 2010 +0100 @@ -1,3 +1,12 @@ +2010-02-20 Matthias Klose <doko@ubuntu.com> + + * Makefile.am (stamps/icedtea.stamp, stamps/icedtea-debug.stamp): + Depend on stamps/plugin.stamp instead of $(ICEDTEAPLUGIN_TARGET) + and $(ICEDTEANPPLUGIN_TARGET). + (icedtea): Depend on stamps/add-zero.stamp and stamps/add-cacao.stamp + (icedtea-debug): Depend on stamps/add-cacao-debug.stamp and + stamps/add-zero-debug.stamp. + 2010-02-19 Matthias Klose <doko@ubuntu.com> * Makefile.am (ADD_ZERO_CONFIGURE_ARGS): Only pass
--- a/Makefile.am Fri Feb 19 20:25:47 2010 +0100 +++ b/Makefile.am Sat Feb 20 21:35:37 2010 +0100 @@ -1318,8 +1318,8 @@ # If you change anything here in the icedtea target, please make sure # you change it in the icedtea-debug target as well. stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ - stamps/plugs.stamp $(OPENJDK_TREE) $(ICEDTEAPLUGIN_TARGET) \ - $(ICEDTEANPPLUGIN_TARGET) extra-lib/about.jar stamps/cacao.stamp \ + stamps/plugs.stamp $(OPENJDK_TREE) stamps/plugin.stamp \ + extra-lib/about.jar stamps/cacao.stamp \ stamps/visualvm.stamp stamps/pulse-java.stamp stamps/rewrite-rhino.stamp $(ARCH_PREFIX) $(MAKE) \ $(ICEDTEA_ENV) \ @@ -1419,8 +1419,8 @@ touch stamps/icedtea.stamp stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \ - stamps/plugs.stamp $(OPENJDK_TREE) $(ICEDTEAPLUGIN_TARGET) \ - $(ICEDTEANPPLUGIN_TARGET) extra-lib/about.jar stamps/cacao.stamp \ + stamps/plugs.stamp $(OPENJDK_TREE) stamps/plugin.stamp \ + extra-lib/about.jar stamps/cacao.stamp \ stamps/visualvm.stamp stamps/pulse-java.stamp stamps/rewrite-rhino.stamp $(ARCH_PREFIX) $(MAKE) \ $(ICEDTEA_ENV) \ @@ -2041,7 +2041,7 @@ # jtreg -stamps/jtreg.stamp: stamps/icedtea.stamp +stamps/jtreg.stamp: stamps/icedtea.stamp stamps/add-zero.stamp stamps/add-cacao.stamp rm -rf test/jtreg/classes mkdir -p test/jtreg/classes $(ICEDTEA_BOOT_DIR)/bin/javac -g -d test/jtreg/classes -source 1.5 \ @@ -2232,11 +2232,11 @@ extract-ecj: stamps/extract-ecj.stamp -icedtea: stamps/icedtea.stamp +icedtea: stamps/icedtea.stamp stamps/add-cacao.stamp stamps/add-zero.stamp icedtea-against-ecj: stamps/icedtea-against-ecj.stamp -icedtea-debug: stamps/icedtea-debug.stamp +icedtea-debug: stamps/icedtea-debug.stamp stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp icedtea-ecj: stamps/icedtea-ecj.stamp