From 8e6f5e813af2b3f3b024993c1a55fda77f4667c1 Mon Sep 17 00:00:00 2001
From: Dan Ballard <dan@mindstab.net>
Date: Tue, 1 Dec 2020 16:02:39 -0800
Subject: [PATCH] fix makefile

---
 Makefile | 30 ++++++------------------------
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/Makefile b/Makefile
index 8d1e200b..42393d15 100644
--- a/Makefile
+++ b/Makefile
@@ -1,51 +1,33 @@
 .PHONY: all clean linux windows android
-all: clean linux windows android
-default: linux
+
+DEFAULT_GOAL: linux
 
 SHELL  := env QT_BUILD_VERSION=$(QT_BUILD_VERSION) $(SHELL)
 QT_BUILD_VERSION ?= "5.13.4"
 
+all: clean linux windows android
+
 clean:
 	rm -r vendor || true
 	find -type f -iname "moc*" | xargs rm
 	find -iname "rcc*" | xargs rm
 
 linux:
-	$(MAKE) linux_build || $(MAKE) linux_clean
-
-windows:
-	$(MAKE) windows_build || $(MAKE) windows_clean
-
-android:
-	$(MAKE) android_build || $(MAKE) android_clean
-
-linux_build:
 	date
 	qtdeploy -qt_version $(QT_BUILD_VERSION) build linux 2>&1 | tee qtdeploy.log | pv
 	date
 	cp -R assets deploy/linux/
-	$(MAKE) linux_clean
 
-linux_clean:
-	#ntd
-
-windows_build:
+windows:
 	date
 	qtdeploy -qt_version $(QT_BUILD_VERSION) build windows 2>&1 | tee qtdeploy.log | pv
 	date
 	cp -R assets deploy/windows/
-	$(MAKE) linux_clean
 
-windows_clean:
-	#ntd
-
-android_build:
+android:
 	cp -R assets android/
 	date
 	## TODO have this also include AndroidExtras (see ANDROID_DEBUGGING) for full notes.
 	env ANDROID_MODULES_INCLUDE="Core,Gui,Svg,QuickWidgets,Xml" qtdeploy -debug -qt_version $(QT_BUILD_VERSION) build android 2>&1 | tee qtdeploy.log | pv
 	date
 
-android_clean:
-	mv android/assets assets
-