From: Niki Roo <niki@nikiroo.be>
Date: Tue, 5 Dec 2017 14:34:31 +0000 (+0100)
Subject: Makefile (better Android Studio support)
X-Git-Tag: fanfix-1.7.0~37
X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=e91d9858849065203785e77b6e1990b240ea1910;p=fanfix.git

Makefile (better Android Studio support)
---

diff --git a/Makefile.base b/Makefile.base
index acc36d3..651b10c 100644
--- a/Makefile.base
+++ b/Makefile.base
@@ -201,14 +201,7 @@ android/app/src:
 		ln -s ../../../../res .; \
 		ln -s ../../../../src ./java; \
 	)
-
-apk: libs ${NAME}.apk
-	@echo Building APK files...
-
-${NAME}.apk: ${NAME}-debug.apk
-
-${NAME}-debug.apk: android
-	@echo Starting gradlew assemble...
+	@echo Fixing configuration...
 	@( \
 		cd android/app/src/main/java; \
 		excl="\\n";\
@@ -223,7 +216,17 @@ ${NAME}-debug.apk: android
 			| sed 's:\(applicationId "\)":\1${ID_FOR_ANDROID}":' \
 			| sed "s:\s*exclude '':$$excl:g" \
 		> build.gradle; \
-		cd ../ ; \
+	)
+
+apk: libs ${NAME}.apk
+	@echo Building APK files...
+
+${NAME}.apk: ${NAME}-debug.apk
+
+${NAME}-debug.apk: android
+	@echo Starting gradlew assemble...
+	@( \
+		cd android/; \
 		bash gradlew assemble && ( \
 			cd ..; \
 			cp android/app/build/outputs/apk/release/app-release-unsigned.apk ${NAME}.apk; \