Mercurial > hg > icedtea13
changeset 2538:0b1bc8378f34
PR1291: Make clean-crypto targets depend on JDK being built.
2013-06-05 Andrew John Hughes <gnu.andrew@member.fsf.org>
* Makefile.am:
(check-crypto): Depend on icedtea.stamp.
(add-archive): Move into correct position in file.
(clean-add-archive): Likewise.
(check-crypto-debug): Depend on icedtea-debug.stamp.
(clean-crypto-boot): Depend on icedtea-boot.stamp.
author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
---|---|
date | Wed, 04 Mar 2015 17:09:59 +0000 |
parents | 4005e0143bc8 |
children | 5da956ae51a8 |
files | ChangeLog Makefile.am |
diffstat | 2 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Mar 04 16:20:09 2015 +0000 +++ b/ChangeLog Wed Mar 04 17:09:59 2015 +0000 @@ -1,3 +1,10 @@ +2013-06-05 Andrew John Hughes <gnu.andrew@member.fsf.org> + + * Makefile.am: + (check-crypto): Depend on icedtea.stamp. + (check-crypto-debug): Depend on icedtea-debug.stamp. + (clean-crypto-boot): Depend on icedtea-boot.stamp. + 2013-06-05 Andrew John Hughes <gnu.andrew@member.fsf.org> PR1291: Ensure unlimited crypto policy is in place.
--- a/Makefile.am Wed Mar 04 16:20:09 2015 +0000 +++ b/Makefile.am Wed Mar 04 17:09:59 2015 +0000 @@ -1595,7 +1595,7 @@ rm -f stamps/icedtea-debug-configure.stamp rm -f stamps/icedtea-debug.stamp -stamps/check-crypto.stamp: stamps/cryptocheck.stamp +stamps/check-crypto.stamp: stamps/cryptocheck.stamp stamps/icedtea.stamp if [ -e $(BUILD_IMAGE_DIR)/j2sdk-image/bin/java ] ; then \ $(BUILD_IMAGE_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \ fi @@ -1621,7 +1621,7 @@ rm -vf $(BUILD_IMAGE_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/*/*.jsa rm -f stamps/add-archive.stamp -stamps/check-crypto-debug.stamp: stamps/cryptocheck.stamp +stamps/check-crypto-debug.stamp: stamps/cryptocheck.stamp stamps/icedtea-debug.stamp if [ -e $(BUILD_DEBUG_IMAGE_DIR)/j2sdk-image/bin/java ] ; then \ $(BUILD_DEBUG_IMAGE_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \ fi @@ -1729,7 +1729,7 @@ rm -f stamps/icedtea-boot-configure.stamp rm -f stamps/icedtea-boot.stamp -stamps/check-crypto-boot.stamp: stamps/cryptocheck.stamp +stamps/check-crypto-boot.stamp: stamps/cryptocheck.stamp stamps/icedtea-boot.stamp if [ -e $(BUILD_BOOT_IMAGE_DIR)/j2sdk-image/bin/java ] ; then \ $(BUILD_BOOT_IMAGE_DIR)/j2sdk-image/bin/java -cp $(CRYPTO_CHECK_BUILD_DIR) TestCryptoLevel ; \ fi