From e2024a23db340e4d589559e0eab710fe292aa91d Mon Sep 17 00:00:00 2001
From: foostan <ks@fstn.jp>
Date: Tue, 30 Jan 2024 00:47:56 +0900
Subject: [PATCH] Update Makefile

---
 Makefile | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index df6c4c12..61a1da60 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: git-submodule, qmk-clean, qmk-init, qmk-compile, qmk-flash
+.PHONY: git-submodule, qmk-clean, qmk-init, qmk-compile, qmk-flash, qmk-init-all, qmk-compile-all
 
 KB := crkbd
 KR := rev1
@@ -14,8 +14,6 @@ qmk-clean:
 
 qmk-init:
 	$(eval KB := ${kb})
-	$(eval KR := ${kr})
-	$(eval KM := ${km})
 	rm -f src/qmk/qmk_firmware/keyboards/tmp/${KB}
 	mkdir -p src/qmk/qmk_firmware/keyboards/tmp
 	ln -s $(shell pwd)/keyboards/${KB}/qmk/qmk_firmware src/qmk/qmk_firmware/keyboards/tmp/${KB}
@@ -24,7 +22,10 @@ qmk-compile:
 	$(eval KB := ${kb})
 	$(eval KR := ${kr})
 	$(eval KM := ${km})
+	$(eval FILE := $(shell echo "${kb}_${kr}_${km}" | sed 's/\//_/'))
 	cd src/qmk/qmk_firmware; qmk compile -kb tmp/${KB}/${KR} -km ${KM}
+	cp src/qmk/qmk_firmware/.build/tmp_${FILE}.hex keyboards/${KB}/qmk/qmk_firmware/.build/${FILE}.hex | true
+	cp src/qmk/qmk_firmware/.build/tmp_${FILE}.uf2 keyboards/${KB}/qmk/qmk_firmware/.build/${FILE}.uf2 | true
 
 qmk-flash:
 	$(eval KB := ${kb})
@@ -33,22 +34,13 @@ qmk-flash:
 	cd src/qmk/qmk_firmware; qmk flash -kb tmp/${KB}/${KR} -km ${KM}
 
 qmk-init-all:
-	kb=crkbd kr=rev1 km=default make qmk-init
-	kb=crkbd kr=rev1 km=via make qmk-init
-	kb=crkbd kr=rev4 km=default make qmk-init
-	kb=crkbd kr=rev4 km=via make qmk-init
-	kb=cornelius kr=rev1 km=default make qmk-init
-	kb=cornelius kr=rev1 km=via make qmk-init
-	kb=cornelius kr=rev2 km=default make qmk-init
-	kb=cornelius kr=rev2 km=via make qmk-init
+	kb=crkbd make qmk-init
+	kb=cornelius make qmk-init
 
 qmk-compile-all:
-	kb=crkbd kr=rev1 km=default make qmk-compile
 	kb=crkbd kr=rev1 km=via make qmk-compile
-	kb=crkbd kr=rev4 km=default make qmk-compile
-	kb=crkbd kr=rev4 km=via make qmk-compile
-	kb=cornelius kr=rev1 km=default make qmk-compile
+	kb=crkbd kr=rev4/standard km=via make qmk-compile
+	kb=crkbd kr=rev4/mini km=via make qmk-compile
 	kb=cornelius kr=rev1 km=via make qmk-compile
-	kb=cornelius kr=rev2 km=default make qmk-compile
 	kb=cornelius kr=rev2 km=via make qmk-compile