diff --git a/android/external/Makefile b/android/external/Makefile index 6ff5f38..6962a34 100644 --- a/android/external/Makefile +++ b/android/external/Makefile @@ -19,7 +19,7 @@ ifdef BUILD_CONFIG $(info ================================================) endif -.PHONY: all build clean +.PHONY: all build clean clean-all all: build @@ -31,6 +31,11 @@ clean: $(MAKE) -C armeabi-v7a clean $(MAKE) -C arm64-v8a clean +clean-all: + $(MAKE) -C common clean + $(MAKE) -C armeabi-v7a clean-all + $(MAKE) -C arm64-v8a clean-all + libiconv-1.15.tar.gz: $(MAKE) -C common diff --git a/android/external/arm64-v8a/Makefile b/android/external/arm64-v8a/Makefile index c901a7d..f3c943c 100644 --- a/android/external/arm64-v8a/Makefile +++ b/android/external/arm64-v8a/Makefile @@ -139,7 +139,7 @@ libetpan-cleanzip: #------------------------------------------------------------------------------# # uuid -uuid.src.stamp: ossp-uuid_1.6.2.orig.tar.gz +uuid.src.stamp: ../ossp-uuid_1.6.2.orig.tar.gz tar xvfz ../ossp-uuid_1.6.2.orig.tar.gz mv uuid-1.6.2 uuid touch $@ @@ -192,13 +192,8 @@ sequoia-deps-build: gmp-install nettle-install openssl-install #------------------------------------------------------------------------------# # OpenSSL -openssl-$(OPENSSL_VERSION).tar.gz: - wget -nc https://www.openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz - md5sum -c ../openssl-$(OPENSSL_VERSION).tar.gz.md5 - touch $@ - -openssl.src.stamp: openssl-$(OPENSSL_VERSION).tar.gz - tar xvf openssl-$(OPENSSL_VERSION).tar.gz +openssl.src.stamp: ../openssl-$(OPENSSL_VERSION).tar.gz + tar xvf ../openssl-$(OPENSSL_VERSION).tar.gz mv openssl-$(OPENSSL_VERSION) openssl touch $@ @@ -232,13 +227,8 @@ openssl-install: $(LOCAL)/lib/libssl.so #------------------------------------------------------------------------------# # GMP -gmp-$(GMP_VERSION).tar.bz2: - wget -nc https://gmplib.org/download/gmp/gmp-$(GMP_VERSION).tar.bz2 - md5sum -c ../gmp-$(GMP_VERSION).tar.bz2.md5 - touch $@ - -gmp.src.stamp: gmp-$(GMP_VERSION).tar.bz2 - tar xvf gmp-$(GMP_VERSION).tar.bz2 +gmp.src.stamp: ../gmp-$(GMP_VERSION).tar.bz2 + tar xvf ../gmp-$(GMP_VERSION).tar.bz2 mv gmp-$(GMP_VERSION) gmp touch $@ @@ -275,13 +265,8 @@ gmp-install: $(LOCAL)/lib/libgmp.so #------------------------------------------------------------------------------# # NETTLE -nettle-$(NETTLE_VERSION).tar.gz: $(LOCAL)/lib/libgmp.so - wget -nc https://ftp.gnu.org/gnu/nettle/nettle-$(NETTLE_VERSION).tar.gz - md5sum -c ../nettle-$(NETTLE_VERSION).tar.gz.md5 - touch $@ - -nettle.src.stamp: nettle-$(NETTLE_VERSION).tar.gz - tar xvf nettle-$(NETTLE_VERSION).tar.gz +nettle.src.stamp: ../nettle-$(NETTLE_VERSION).tar.gz $(LOCAL)/lib/libgmp.so + tar xvf ../nettle-$(NETTLE_VERSION).tar.gz mv nettle-$(NETTLE_VERSION) nettle touch $@ @@ -422,7 +407,7 @@ clean-assets: rm -rf $(ASSETS) clean-install: - rm -rf $(DESTDIR)/data + rm -rf $(LOCAL) clean: $(EXTERNAL_SRCS_CLEAN) clean-assets clean-install libetpan-cleanzip diff --git a/android/external/armeabi-v7a/Makefile b/android/external/armeabi-v7a/Makefile index 28d4c62..49067d3 100644 --- a/android/external/armeabi-v7a/Makefile +++ b/android/external/armeabi-v7a/Makefile @@ -145,7 +145,7 @@ libetpan-cleanzip: # using released package from debian. official ftp wasn't available today -uuid.src.stamp: ossp-uuid_1.6.2.orig.tar.gz +uuid.src.stamp: ../ossp-uuid_1.6.2.orig.tar.gz tar xvfz ../ossp-uuid_1.6.2.orig.tar.gz mv uuid-1.6.2 uuid touch $@ @@ -201,13 +201,8 @@ sequoia-deps-build: gmp-install nettle-install openssl-install #------------------------------------------------------------------------------# # OpenSSL -openssl-$(OPENSSL_VERSION).tar.gz: - wget -nc https://www.openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz - md5sum -c ../openssl-$(OPENSSL_VERSION).tar.gz.md5 - touch $@ - -openssl.src.stamp: openssl-$(OPENSSL_VERSION).tar.gz - tar xvf openssl-$(OPENSSL_VERSION).tar.gz +openssl.src.stamp: ../openssl-$(OPENSSL_VERSION).tar.gz + tar xvf ../openssl-$(OPENSSL_VERSION).tar.gz mv openssl-$(OPENSSL_VERSION) openssl touch $@ @@ -242,13 +237,8 @@ openssl-install: $(LOCAL)/lib/libssl.so #------------------------------------------------------------------------------# # GMP -gmp-$(GMP_VERSION).tar.bz2: - wget -nc https://gmplib.org/download/gmp/gmp-$(GMP_VERSION).tar.bz2 - md5sum -c ../gmp-$(GMP_VERSION).tar.bz2.md5 - touch $@ - -gmp.src.stamp: gmp-$(GMP_VERSION).tar.bz2 - tar xvf gmp-$(GMP_VERSION).tar.bz2 +gmp.src.stamp: ../gmp-$(GMP_VERSION).tar.bz2 + tar xvf ../gmp-$(GMP_VERSION).tar.bz2 mv gmp-$(GMP_VERSION) gmp touch $@ @@ -282,13 +272,8 @@ gmp-install: $(LOCAL)/lib/libgmp.so #------------------------------------------------------------------------------# # NETTLE -nettle-$(NETTLE_VERSION).tar.gz: $(LOCAL)/lib/libgmp.so - wget -nc https://ftp.gnu.org/gnu/nettle/nettle-$(NETTLE_VERSION).tar.gz - md5sum -c ../nettle-$(NETTLE_VERSION).tar.gz.md5 - touch $@ - -nettle.src.stamp: nettle-$(NETTLE_VERSION).tar.gz - tar xvf nettle-$(NETTLE_VERSION).tar.gz +nettle.src.stamp: ../nettle-$(NETTLE_VERSION).tar.gz $(LOCAL)/lib/libgmp.so + tar xvf ../nettle-$(NETTLE_VERSION).tar.gz mv nettle-$(NETTLE_VERSION) nettle touch $@ @@ -428,7 +413,7 @@ clean-assets: rm -rf $(ASSETS) clean-install: - rm -rf $(DESTDIR)/data + rm -rf $(LOCAL) clean: $(EXTERNAL_SRCS_CLEAN) clean-assets clean-install libetpan-cleanzip diff --git a/android/external/common/Makefile b/android/external/common/Makefile index 3a29c63..d405578 100644 --- a/android/external/common/Makefile +++ b/android/external/common/Makefile @@ -13,12 +13,14 @@ include ../Makefile.conf #------------------------------------------------------------------------------# # Build parameters -all: download-iconv download-uuid #build-etpan download sequoia +all: download-iconv download-uuid download-sequoia-deps #build-etpan download sequoia download-iconv: ../libiconv-1.15.tar.gz download-uuid: ../ossp-uuid_1.6.2.orig.tar.gz +download-sequoia-deps: ../openssl-$(OPENSSL_VERSION).tar.gz ../gmp-$(GMP_VERSION).tar.bz2 ../nettle-$(NETTLE_VERSION).tar.gz + # Download source and patch it ../libiconv-1.15.tar.gz: wget https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.15.tar.gz -P ../ @@ -27,8 +29,25 @@ download-uuid: ../ossp-uuid_1.6.2.orig.tar.gz wget http://http.debian.net/debian/pool/main/o/ossp-uuid/ossp-uuid_1.6.2.orig.tar.gz -P ../ cd .. && md5sum -c ossp-uuid_1.6.2.orig.tar.gz.md5 +../openssl-$(OPENSSL_VERSION).tar.gz: + wget -nc https://www.openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz -P ../ + cd .. && md5sum -c openssl-$(OPENSSL_VERSION).tar.gz.md5 + +../gmp-$(GMP_VERSION).tar.bz2: + wget -nc https://gmplib.org/download/gmp/gmp-$(GMP_VERSION).tar.bz2 -P ../ + cd .. && md5sum -c gmp-$(GMP_VERSION).tar.bz2.md5 + +../nettle-$(NETTLE_VERSION).tar.gz: + wget -nc https://ftp.gnu.org/gnu/nettle/nettle-$(NETTLE_VERSION).tar.gz -P ../ + cd .. && md5sum -c nettle-$(NETTLE_VERSION).tar.gz.md5 + + + clean: rm -rf ../libiconv-1.15.tar.gz rm -rf ../ossp-uuid_1.6.2.orig.tar.gz + rm -rf ../openssl-$(OPENSSL_VERSION).tar.gz + rm -rf ../gmp-$(GMP_VERSION).tar.bz2 + rm -rf ../nettle-$(NETTLE_VERSION).tar.gz .PHONY: clean download-iconv download-uuid \ No newline at end of file