From 67f50f311e7d7ea1011689912d5a1c329029cddf Mon Sep 17 00:00:00 2001 From: ignaciogarcia Date: Thu, 27 Oct 2022 13:32:02 +0200 Subject: [PATCH] PEMA-107 Make all -clean targets work with a pattern (except sequoia-ffi) --- android/external/MakefileTemplate | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/android/external/MakefileTemplate b/android/external/MakefileTemplate index 3c93871..8d06afe 100644 --- a/android/external/MakefileTemplate +++ b/android/external/MakefileTemplate @@ -82,10 +82,6 @@ libiconv.src.stamp: ../downloads/libiconv-1.15.tar.gz libiconv-src: libiconv.src.stamp -libiconv-clean: - rm -rf libiconv - rm -rf libiconv.src.stamp - libiconv/Makefile: libiconv.src.stamp cd libiconv && \ CC="$(CC)" LD="$(LD)" AR="$(AR)" AS="$(AS)" RANLIB=$(RANLIB) STRIP="$(STRIP)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ @@ -123,10 +119,6 @@ libetpan/Makefile: libetpan.src.stamp | libiconv-install libetpan-build: libetpan/Makefile -libetpan-clean: - rm -rf libetpan - rm -rf libetpan.src.stamp - #------------------------------------------------------------------------------# # uuid @@ -137,10 +129,6 @@ uuid.src.stamp: ../downloads/ossp-uuid_1.6.2.orig-patched.tar.gz uuid-src: uuid.src.stamp -uuid-clean: - rm -rf uuid - rm -rf uuid.src.stamp - uuid/Makefile: uuid.src.stamp $(SED) -i 's,AC_CHECK_VA_COPY(),,' uuid/uuid.ac cd uuid && autoconf @@ -189,10 +177,6 @@ openssl.src.stamp: ../downloads/openssl-$(OPENSSL_VERSION).tar.gz openssl-src: openssl.src.stamp -openssl-clean: - rm -rf openssl - rm -rf openssl.src.stamp - OPENSSL_ARCHITECTURE:=[OPENSSL_ARCHITECTURE] openssl/Makefile: openssl.src.stamp @@ -224,10 +208,6 @@ gmp.src.stamp: ../downloads/gmp-$(GMP_VERSION).tar.bz2 gmp-src: gmp.src.stamp -gmp-clean: - rm -rf gmp - rm -rf gmp.src.stamp - gmp/Makefile: gmp.src.stamp cd gmp && \ CC="$(CC)" LD="$(LD)" AR="$(AR)" AS="$(AS)" RANLIB=$(RANLIB) STRIP="$(STRIP)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ @@ -261,10 +241,6 @@ nettle.src.stamp: ../downloads/nettle-$(NETTLE_VERSION)-patched.tar.gz $(LOCAL)/ nettle-src: nettle.src.stamp -nettle-clean: - rm -rf nettle - rm -rf nettle.src.stamp - nettle/Makefile: nettle.src.stamp gmp-install cd nettle && \ CC="$(CC)" LD="$(LD)" AR="$(AR)" AS="$(AS)" RANLIB=$(RANLIB) STRIP="$(STRIP)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ @@ -356,6 +332,9 @@ sequoia-ffi-install: sequoia-deps-build $(LOCAL)/lib/libsequoia_openpgp_ffi.so #------------------------------------------------------------------------------# # clean +%-clean: + rm -rf $* + rm -rf $*.src.stamp clean-assets: rm -rf $(ASSETS)