From 372adb58c1272e3c664457c64a23bc14e343d327 Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Sat, 26 Mar 2022 19:24:27 -0700 Subject: [PATCH] testing/makefiles/delegate.mk was a no-op --- testing/makefiles/delegate.mk | 48 ----------------------------------- testing/makefiles/testcase.mk | 2 +- 2 files changed, 1 insertion(+), 49 deletions(-) delete mode 100644 testing/makefiles/delegate.mk diff --git a/testing/makefiles/delegate.mk b/testing/makefiles/delegate.mk deleted file mode 100644 index 19019b31..00000000 --- a/testing/makefiles/delegate.mk +++ /dev/null @@ -1,48 +0,0 @@ -# This makefile for a Kaleidoscope sketch pulls in all the targets -# required to build the example - - - - -ifneq ($(KALEIDOSCOPE_DIR),) -search_path += $(KALEIDOSCOPE_DIR) -endif - -ifneq ($(ARDUINO_DIRECTORIES_USER),) -search_path += $(ARDUINO_DIRECTORIES_USER)/hardware/keyboardio/avr/libraries/Kaleidoscope -endif - -ifeq ($(shell uname -s),Darwin) -search_path += $(HOME)/Documents/Arduino/hardware/keyboardio/avr/libraries/Kaleidoscope -else -search_path += $(HOME)/Arduino/hardware/keyboardio/avr/libraries/Kaleidoscope -endif - -sketch_makefile := etc/makefiles/sketch.mk - -$(foreach candidate, $(search_path), $(if $(wildcard $(candidate)/$(sketch_makefile)), $(eval ks_dir ?= $(candidate)))) - -ifneq ($(ks_dir),) - -$(info Using Kaleidoscope from $(ks_dir)) - -export KALEIDOSCOPE_DIR := $(ks_dir) -include $(ks_dir)/$(sketch_makefile) - -else - -$(info I can't find your Kaleidoscope installation.) -$(info ) -$(info I tried looking in:) -$(info ) -$(foreach candidate, $(search_path), $(info $(candidate))) -$(info ) -$(info The easiest way to fix this is to set the 'KALEIDOSCOPE_DIR' environment) -$(info variable to the location of your Kaleidoscope directory.) - -endif - - -null-target: - $(info You should never see this message) - @: diff --git a/testing/makefiles/testcase.mk b/testing/makefiles/testcase.mk index 99bce816..15ed42c3 100644 --- a/testing/makefiles/testcase.mk +++ b/testing/makefiles/testcase.mk @@ -78,7 +78,7 @@ compile-sketch: ${TEST_OBJS} @install -d "${BIN_DIR}" "${LIB_DIR}" $(QUIET) env LIBONLY=yes VERBOSE=${VERBOSE} \ OUTPUT_PATH="${LIB_DIR}" \ - $(MAKE) -f ${top_dir}/testing/makefiles/delegate.mk compile + $(MAKE) -f ${top_dir}/etc/makefiles/sketch.mk compile $(QUIET) $(COMPILER_WRAPPER) $(call _arduino_prop,compiler.cpp.cmd) -o "${BIN_DIR}/${BIN_FILE}" \ -lpthread -g -w ${TEST_OBJS} \ -L"${COMMON_LIB_DIR}" -lcommon \