diff --git a/Makefile b/Makefile index f24146a4..ded28e4f 100644 --- a/Makefile +++ b/Makefile @@ -36,15 +36,12 @@ ifneq ($(TEST_PATH),) TEST_PATH_ARG="TEST_PATH='$(TEST_PATH)'" endif - DEFAULT_GOAL: smoke-sketches - .PHONY: setup setup: $(ARDUINO_CLI_PATH) $(ARDUINO_DIRECTORIES_DATA)/arduino-cli.yaml install-arduino-core-avr install-arduino-core-kaleidoscope $(ARDUINO_DIRECTORIES_USER)/hardware/keyboardio/avr/boards.txt $(ARDUINO_DIRECTORIES_USER)/hardware/keyboardio/virtual/boards.txt @: - .PHONY: checkout-platform checkout-platform: $(ARDUINO_DIRECTORIES_USER)/hardware/keyboardio/avr/boards.txt @: @@ -56,7 +53,6 @@ prepare-virtual: $(ARDUINO_DIRECTORIES_USER)/hardware/keyboardio/virtual/boards. $(ARDUINO_DIRECTORIES_USER)/hardware/keyboardio/virtual/boards.txt: $(MAKE) -C $(ARDUINO_DIRECTORIES_USER)/hardware/keyboardio prepare-virtual - $(ARDUINO_DIRECTORIES_USER)/hardware/keyboardio/avr/boards.txt: git clone -c core.symlinks=true \ --recurse-submodules \ @@ -110,7 +106,6 @@ build-gtest-gmock: find-filename-conflicts: bin/find-filename-conflicts.py src plugins/* - .PHONY: format format: bin/format-code.py \ @@ -145,7 +140,6 @@ SMOKE_SKETCHES := $(sort $(shell if [ -d ./examples ]; then find ./examples -typ smoke-sketches: $(SMOKE_SKETCHES) @echo "Smoke-tested all the sketches" - .PHONY: clean clean: $(MAKE) -C tests clean @@ -156,7 +150,6 @@ clean: $(SMOKE_SKETCHES): force $(MAKE) -C $@ -f $(KALEIDOSCOPE_ETC_DIR)/makefiles/sketch.mk compile - build-arduino-nightly-package: perl bin/build-arduino-package \ --kaleidoscope-tag=master \ diff --git a/tests/Makefile b/tests/Makefile index 9602dd67..66c66159 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -37,17 +37,12 @@ TESTS := $(shell cd $(tests_dir); find ${TEST_PATH} -name '*.ino' -exec dirname # The clutter up the test output on Make 4.0 and newer MAKEFLAGS += --no-print-directory - include $(top_dir)/etc/makefiles/arduino-cli.mk # If we start off in tests to run make all, the sketch makefiles guess the wrong location for # Kaliedoscope's makefiles - KALEIDOSCOPE_ETC_DIR ?= $(top_dir)/etc - - - .PHONY: all all: ${libcommon_a} googletest ${TESTS} @: @@ -64,8 +59,6 @@ run-all: ${TESTS} done; \ if [ -n $${ERROR} ]; then exit $${ERROR}; fi - - .PHONY: clean clean: cmake-clean @for test in ${TESTS}; do \