From e3248f4d4a73dfe1076dc634452535cc2316e2bb Mon Sep 17 00:00:00 2001
From: Tony Mountifield <tony@mountifield.org>
Date: Mon, 10 Aug 2026 12:41:02 +0100
Subject: [PATCH 1/2] Add Android json file to distclean

---
 Jamulus.pro | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Jamulus.pro b/Jamulus.pro
index 575c329732..2212cb215a 100644
--- a/Jamulus.pro
+++ b/Jamulus.pro
@@ -289,6 +289,7 @@ win32 {
     HEADERS += $$OBOE_HEADERS
     SOURCES += $$OBOE_SOURCES
     DISTFILES += $$DISTFILES_OBOE
+    QMAKE_DISTCLEAN += android-$${TARGET}-deployment-settings.json
 } else:unix {
     # we want to compile with C++11
     CONFIG += c++11

From a6d211b5950334c1a861aec7bbcbf0ab90339647 Mon Sep 17 00:00:00 2001
From: Tony Mountifield <tony@mountifield.org>
Date: Mon, 10 Aug 2026 12:42:23 +0100
Subject: [PATCH 2/2] Add directories to make distclean

QMAKE_DISTCLEAN only removes files, so we need to use a custom target.
---
 Jamulus.pro | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/Jamulus.pro b/Jamulus.pro
index 2212cb215a..40bf09c16f 100644
--- a/Jamulus.pro
+++ b/Jamulus.pro
@@ -1199,3 +1199,27 @@ CLANG_FORMAT_SOURCES = $$find(CLANG_FORMAT_SOURCES, ^\(android|ios|mac|linux|src
 CLANG_FORMAT_SOURCES ~= s!^\(libs/.*/|src/res/qrc_resources\.cpp\)\S*$!!g
 clang_format.commands = 'clang-format -i $$CLANG_FORMAT_SOURCES'
 QMAKE_EXTRA_TARGETS += clang_format
+
+# QMAKE_DISTCLEAN only removes files. Use a custom target to remove
+# generated directory trees. Deliberately do not remove user-installed
+# dependencies such as libs/ASIOSDK2.
+android {
+    for (abi, ANDROID_ABIS) {
+        DISTCLEAN_DIRS += debug-$${abi} release-$${abi}
+    }
+    DISTCLEAN_DIRS += .qm
+} else {
+    DISTCLEAN_DIRS += debug release .qm
+}
+
+win32 {
+    for(dir, DISTCLEAN_DIRS) {
+        distclean_dirs.commands += if exist $$replace(dir, /, \\) rmdir /s /q $$replace(dir, /, \\) $$escape_expand(\\n\\t)
+    }
+} else {
+    # Works for Linux, macOS, iOS, and Android using standard Unix rm
+    distclean_dirs.commands += rm -rf $$DISTCLEAN_DIRS
+}
+
+QMAKE_EXTRA_TARGETS += distclean_dirs
+DISTCLEAN_DEPS += distclean_dirs