From 9957a83746fb7c6b000e9f9931bcb32a926f5787 Mon Sep 17 00:00:00 2001
From: Conor Patrick <conorpp94@gmail.com>
Date: Tue, 12 Feb 2019 16:03:04 -0500
Subject: [PATCH] organize makefiles

---
 targets/stm32l432/Makefile                   | 25 +++++++++++---------
 targets/stm32l432/{ => build}/application.mk |  0
 targets/stm32l432/{ => build}/bootloader.mk  |  0
 3 files changed, 14 insertions(+), 11 deletions(-)
 rename targets/stm32l432/{ => build}/application.mk (100%)
 rename targets/stm32l432/{ => build}/bootloader.mk (100%)

diff --git a/targets/stm32l432/Makefile b/targets/stm32l432/Makefile
index 017998f..9c23cec 100644
--- a/targets/stm32l432/Makefile
+++ b/targets/stm32l432/Makefile
@@ -2,30 +2,33 @@ ifndef DEBUG
 DEBUG=0
 endif
 
+APPMAKE=build/application.mk
+BOOTMAKE=build/application.mk
+
 merge_hex=python ../../tools/solotool.py mergehex
 
 all:
-	$(MAKE) -f application.mk -j8 solo.hex PREFIX=$(PREFIX) DEBUG=$(DEBUG) EXTRA_DEFINES='-DFLASH_ROP=1'
+	$(MAKE) -f $(APPMAKE) -j8 solo.hex PREFIX=$(PREFIX) DEBUG=$(DEBUG) EXTRA_DEFINES='-DFLASH_ROP=1'
 
 all-hacker:
-	$(MAKE) -f application.mk -j8 solo.hex PREFIX=$(PREFIX) DEBUG=$(DEBUG) EXTRA_DEFINES='-DSOLO_HACKER -DFLASH_ROP=0'
+	$(MAKE) -f $(APPMAKE) -j8 solo.hex PREFIX=$(PREFIX) DEBUG=$(DEBUG) EXTRA_DEFINES='-DSOLO_HACKER -DFLASH_ROP=0'
 
 all-locked:
-	$(MAKE) -f application.mk -j8 solo.hex PREFIX=$(PREFIX) EXTRA_DEFINES='-DFLASH_ROP=2'
+	$(MAKE) -f $(APPMAKE) -j8 solo.hex PREFIX=$(PREFIX) EXTRA_DEFINES='-DFLASH_ROP=2'
 
 debugboot-app:
-	$(MAKE) -f application.mk -j8 solo.hex DEBUG=2 PREFIX=$(PREFIX)\
+	$(MAKE) -f $(APPMAKE) -j8 solo.hex DEBUG=2 PREFIX=$(PREFIX)\
 	LDSCRIPT=linker/stm32l4xx_extra.ld EXTRA_DEFINES='-DAPPLICATION_START_PAGE=16 -DSOLO_HACKER'
 
 debugboot-boot:
-	$(MAKE) -f bootloader.mk -j8 bootloader.hex PREFIX=$(PREFIX) DEBUG=1 \
+	$(MAKE) -f $(BOOTMAKE) -j8 bootloader.hex PREFIX=$(PREFIX) DEBUG=1 \
 	LDSCRIPT=linker/bootloader_stm32l4xx_extra.ld EXTRA_DEFINES='-DAPPLICATION_START_PAGE=16 -DSOLO_HACKER'
 
 boot-sig-checking:
-	$(MAKE) -f bootloader.mk -j8 bootloader.hex PREFIX=$(PREFIX) DEBUG=0
+	$(MAKE) -f $(BOOTMAKE) -j8 bootloader.hex PREFIX=$(PREFIX) DEBUG=0
 
 boot-no-sig:
-	$(MAKE) -f bootloader.mk -j8 bootloader.hex PREFIX=$(PREFIX) EXTRA_DEFINES='-DSOLO_HACKER' DEBUG=0
+	$(MAKE) -f $(BOOTMAKE) -j8 bootloader.hex PREFIX=$(PREFIX) EXTRA_DEFINES='-DSOLO_HACKER' DEBUG=0
 
 build-release-locked: clean2 boot-sig-checking clean all-locked
 	$(merge_hex) solo.hex bootloader.hex all.hex
@@ -38,12 +41,12 @@ build-hacker: clean2 boot-no-sig clean all-hacker
 	$(merge_hex) solo.hex bootloader.hex all.hex
 
 clean:
-	$(MAKE) -f application.mk clean
-	$(MAKE) -f bootloader.mk clean
+	$(MAKE) -f $(APPMAKE) clean
+	$(MAKE) -f $(BOOTMAKE) clean
 clean2:
 	rm -f solo.hex bootloader.hex all.hex
-	$(MAKE) -f application.mk clean
-	$(MAKE) -f bootloader.mk clean
+	$(MAKE) -f $(APPMAKE) clean
+	$(MAKE) -f $(BOOTMAKE) clean
 
 
 flash: solo.hex bootloader.hex
diff --git a/targets/stm32l432/application.mk b/targets/stm32l432/build/application.mk
similarity index 100%
rename from targets/stm32l432/application.mk
rename to targets/stm32l432/build/application.mk
diff --git a/targets/stm32l432/bootloader.mk b/targets/stm32l432/build/bootloader.mk
similarity index 100%
rename from targets/stm32l432/bootloader.mk
rename to targets/stm32l432/build/bootloader.mk