From f72e0eea649b1bedcedc23959ea711821d60ad0c Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Thu, 22 Sep 2022 17:56:16 +0100
Subject: preparing for Model100 & new Kaleidoscope

---
 Makefile | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 91c76f6..8807c96 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,9 @@
-UNAME_S := $(shell uname -s)
-
 THISDIR := $(shell dirname $(lastword $(MAKEFILE_LIST)))
 
-export SKETCHBOOK_DIR = $(shell readlink -f $(THISDIR)/..)
-
-export ARDUINO_PATH = $(SKETCHBOOK_DIR)/arduino-1.8.7
-export PACKAGE_DIR = $(SKETCHBOOK_DIR)/built
-export LIB_PROPERTIES_PATH = $(THISDIR)
-
-KALEIDOSCOPE_BUILDER_DIR = $(SKETCHBOOK_DIR)/hardware/keyboardio/avr/libraries/Kaleidoscope/bin/
-
-BOARD_HARDWARE_PATH = $(SKETCHBOOK_DIR)/hardware
-KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR = keyboardio/avr/build-tools/makefiles/
+export KALEIDOSCOPE_DIR = $(shell readlink -f $(THISDIR)/../Kaleidoscope)
 
-DAKKAR_VERSION := $(shell grep -E '^version=' $(THISDIR)/library.properties | cut -d= -f2)-$(shell git describe --dirty --always --tags --first-parent)
+DAKKAR_VERSION := $(shell git describe --dirty --always --tags --first-parent)
 
 export LOCAL_CFLAGS = -DBUILD_INFORMATION="$(DAKKAR_VERSION)"
 
-include $(BOARD_HARDWARE_PATH)/$(KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR)/rules.mk
+include $(KALEIDOSCOPE_DIR)/etc/makefiles/sketch.mk
-- 
cgit v1.2.3