Mercurial > hg > release > icedtea7-2.0
changeset 2416:12beb2f3e5fc
Cleanup dependencies in extracting the OpenJDK tree.
2011-05-20 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
(extract): Depend on extract-hotspot and
sanitise-hotspot.
(extract-jaxws): Depend on sanitise-openjdk
rather than extract-openjdk to get the
complete version.
(remove-intree-libraries): Likewise.
(generated): Remove dependencies. Doesn't
require anything.
(patch-fsg): Depend on sanitise-openjdk.
(icedtea-boot): Depend on generated.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Fri, 20 May 2011 02:50:23 +0100 |
| parents | 32c0d08ab7b3 |
| children | e7b97b6e8ece |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 21 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri May 20 02:40:36 2011 +0100 +++ b/ChangeLog Fri May 20 02:50:23 2011 +0100 @@ -1,3 +1,17 @@ +2011-05-20 Andrew John Hughes <ahughes@redhat.com> + + * Makefile.am: + (extract): Depend on extract-hotspot and + sanitise-hotspot. + (extract-jaxws): Depend on sanitise-openjdk + rather than extract-openjdk to get the + complete version. + (remove-intree-libraries): Likewise. + (generated): Remove dependencies. Doesn't + require anything. + (patch-fsg): Depend on sanitise-openjdk. + (icedtea-boot): Depend on generated. + 2011-05-20 Andrew John Hughes <ahughes@redhat.com> Ensure all our macros have an IT_ prefix.
--- a/Makefile.am Fri May 20 02:40:36 2011 +0100 +++ b/Makefile.am Fri May 20 02:50:23 2011 +0100 @@ -1125,7 +1125,8 @@ stamps/extract.stamp: stamps/extract-openjdk.stamp \ stamps/extract-cacao.stamp stamps/extract-jaxws.stamp \ - stamps/remove-intree-libraries.stamp stamps/extract-jamvm.stamp + stamps/remove-intree-libraries.stamp stamps/extract-jamvm.stamp \ + stamps/extract-hotspot.stamp stamps/sanitise-openjdk.stamp mkdir -p stamps touch $@ @@ -1304,7 +1305,7 @@ rm -f stamps/extract-jamvm.stamp stamps/extract-jaxws.stamp: stamps/download-jaxws-drop.stamp \ - stamps/download-jaf-drop.stamp stamps/extract-openjdk.stamp + stamps/download-jaf-drop.stamp stamps/sanitise-openjdk.stamp set -e ; \ if test "x$(NEED_JAXWS_SRC)" = "xtrue"; then \ (cd openjdk/jaxws ; \ @@ -1324,14 +1325,14 @@ mkdir -p stamps rm -f stamps/extract-jaxws.stamp -stamps/remove-intree-libraries.stamp: stamps/extract-openjdk.stamp +stamps/remove-intree-libraries.stamp: stamps/sanitise-openjdk.stamp sh $(abs_top_builddir)/remove-intree-libraries.sh touch stamps/remove-intree-libraries.stamp clean-remove-intree-libraries: rm -f stamps/remove-intree-libraries.stamp -stamps/generated.stamp: stamps/extract.stamp +stamps/generated.stamp: set -e ; \ if [ ! -e $(abs_top_builddir)/generated.build ]; then \ cp -pPR $(abs_top_srcdir)/generated $(abs_top_builddir)/generated.build; \ @@ -1344,7 +1345,7 @@ rm -rf $(abs_top_builddir)/generated.build rm -f stamps/generated.stamp -stamps/patch-fsg.stamp: stamps/generated.stamp +stamps/patch-fsg.stamp: stamps/sanitise-openjdk.stamp mkdir -p stamps ; \ rm -f stamps/patch-fsg.stamp.tmp ; \ touch stamps/patch-fsg.stamp.tmp ; \ @@ -1918,7 +1919,7 @@ stamps/icedtea-boot.stamp: stamps/bootstrap-directory-symlink-stage1.stamp \ stamps/download.stamp $(OPENJDK_BOOT_TREE) stamps/cacao.stamp \ - stamps/rewrite-rhino.stamp stamps/jamvm.stamp + stamps/rewrite-rhino.stamp stamps/jamvm.stamp stamps/generated.stamp $(ARCH_PREFIX) $(MAKE) \ $(ICEDTEA_ENV_BOOT) \ -C openjdk-boot \