alpha
/
Kaleidoscope
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do a slightly better job looking for the included makefile

Browse Source
tmp/arduino-cli-pre-rebase
Jesse Vincent 4 years ago
parent 91748a3832
commit aca513de9b
No known key found for this signature in database
GPG Key ID: CC228463465E40BC
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File

8
Makefile
Unescape View File

@ -19,13 +19,13 @@ endif
# the hardware directory can be determined in relation to the position of # the hardware directory can be determined in relation to the position of
# this Makefile. # this Makefile.
KALEIDOSCOPE_ETC_DIR ?= $(ARDUINO_DIRECTORIES_USER)/hardware/keyboardio/avr/libraries/Kaleidoscope/etc/
ifeq ("$(KALEIDOSCOPE_ETC_DIR)/sketch-arduino-cli.mk","") ifeq ("$(KALEIDOSCOPE_ETC_DIR)/sketch-arduino-cli.mk","")
# Determine the path of this Makefile # Determine the path of this Makefile
MKFILE_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) KALEIDOSCOPE_ETC_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))/etc
endif
KALEIDOSCOPE_ETC_DIR ?= $(ARDUINO_DIRECTORIES_USER)/hardware/keyboardio/avr/libraries/Kaleidoscope/etc/ endif
include $(KALEIDOSCOPE_ETC_DIR)/sketch-arduino-cli.mk include $(KALEIDOSCOPE_ETC_DIR)/sketch-arduino-cli.mk
@ -37,8 +37,6 @@ ifneq ($(TEST_PATH),)
TEST_PATH_ARG="TEST_PATH='$(TEST_PATH)'" TEST_PATH_ARG="TEST_PATH='$(TEST_PATH)'"
endif endif
clean: clean:
$(MAKE) -C tests clean $(MAKE) -C tests clean
rm -rf testing/googletest/build/* rm -rf testing/googletest/build/*

Write Preview
Loading…
Cancel
Save