From 8a76c25394c92ff0c5b5dee75f6c32001616e7c9 Mon Sep 17 00:00:00 2001
From: Cory McWilliams <cory@unprompted.com>
Date: Sun, 4 Aug 2024 12:10:52 -0400
Subject: [PATCH] Silence some OpenSSL build output so I can see what else is
 going on.  Also install the signed fdroid APK in dist.

---
 GNUmakefile       | 3 ++-
 tools/ssl-android | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index 2f8e4983..d925dfe4 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -968,7 +968,7 @@ clean:
 	rm -rf $(BUILD_DIR)
 .PHONY: clean
 
-dist: release-apk iosrelease-ipa aab $(if $(HAVE_WIN), out/winrelease/tildefriends.standalone.exe)
+dist: release-apk iosrelease-ipa aab $(if $(HAVE_WIN), out/winrelease/tildefriends.standalone.exe) out/TildeFriends-release.fdroid.apk
 	@echo [archive] dist/tildefriends-$(VERSION_NUMBER).tar.xz
 	@rm -rf out/tildefriends-$(VERSION_NUMBER)
 	@mkdir -p dist/ out/tildefriends-$(VERSION_NUMBER)
@@ -1000,6 +1000,7 @@ dist: release-apk iosrelease-ipa aab $(if $(HAVE_WIN), out/winrelease/tildefrien
 	@test $(HAVE_WIN) && echo "[cp] tildefriends-$(VERSION_NUMBER).exe"
 	@test $(HAVE_WIN) && cp out/winrelease/tildefriends.standalone.exe dist/tildefriends-$(VERSION_NUMBER).exe
 	@cp out/TildeFriends.aab dist/TildeFriends-$(VERSION_NUMBER).aab
+	@cp out/TildeFriends-release.fdroid.apk dist/TildeFriends-$(VERSION_NUMBER).fdroid.apk
 .PHONY: dist
 
 dist-test: dist
diff --git a/tools/ssl-android b/tools/ssl-android
index 117644c4..5a946e6f 100755
--- a/tools/ssl-android
+++ b/tools/ssl-android
@@ -80,9 +80,9 @@ build_the_thing() {
     pwd
     echo "./Configure $SSL_TARGET $OPTIONS $GLOBAL_OPTIONS" && \
     ./Configure $SSL_TARGET $OPTIONS $GLOBAL_OPTIONS && \
-    make clean && \
-    make build_generated && \
-    make libcrypto.a libssl.a || exit 128
+    make -s clean && \
+    make -s build_generated && \
+    make -s libcrypto.a libssl.a || exit 128
 }
 
 for build_target in $BUILD_TARGETS