Remove some whitespace to make formatting more consistent

There were sometimes two blank lines instead of one between makefile targets,
without any clear pattern.  Now each one is separated from the next by one blank
line.

Signed-off-by: Michael Richters <gedankenexperimenter@gmail.com>
pull/1155/head
Michael Richters 3 years ago
parent 67d47d6904
commit 6e53a6bbb3
No known key found for this signature in database
GPG Key ID: 1288FD13E4EEF0C0

@ -36,15 +36,12 @@ ifneq ($(TEST_PATH),)
TEST_PATH_ARG="TEST_PATH='$(TEST_PATH)'" TEST_PATH_ARG="TEST_PATH='$(TEST_PATH)'"
endif endif
DEFAULT_GOAL: smoke-sketches DEFAULT_GOAL: smoke-sketches
.PHONY: setup .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 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 .PHONY: checkout-platform
checkout-platform: $(ARDUINO_DIRECTORIES_USER)/hardware/keyboardio/avr/boards.txt 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: $(ARDUINO_DIRECTORIES_USER)/hardware/keyboardio/virtual/boards.txt:
$(MAKE) -C $(ARDUINO_DIRECTORIES_USER)/hardware/keyboardio prepare-virtual $(MAKE) -C $(ARDUINO_DIRECTORIES_USER)/hardware/keyboardio prepare-virtual
$(ARDUINO_DIRECTORIES_USER)/hardware/keyboardio/avr/boards.txt: $(ARDUINO_DIRECTORIES_USER)/hardware/keyboardio/avr/boards.txt:
git clone -c core.symlinks=true \ git clone -c core.symlinks=true \
--recurse-submodules \ --recurse-submodules \
@ -110,7 +106,6 @@ build-gtest-gmock:
find-filename-conflicts: find-filename-conflicts:
bin/find-filename-conflicts.py src plugins/* bin/find-filename-conflicts.py src plugins/*
.PHONY: format .PHONY: format
format: format:
bin/format-code.py \ bin/format-code.py \
@ -145,7 +140,6 @@ SMOKE_SKETCHES := $(sort $(shell if [ -d ./examples ]; then find ./examples -typ
smoke-sketches: $(SMOKE_SKETCHES) smoke-sketches: $(SMOKE_SKETCHES)
@echo "Smoke-tested all the sketches" @echo "Smoke-tested all the sketches"
.PHONY: clean .PHONY: clean
clean: clean:
$(MAKE) -C tests clean $(MAKE) -C tests clean
@ -156,7 +150,6 @@ clean:
$(SMOKE_SKETCHES): force $(SMOKE_SKETCHES): force
$(MAKE) -C $@ -f $(KALEIDOSCOPE_ETC_DIR)/makefiles/sketch.mk compile $(MAKE) -C $@ -f $(KALEIDOSCOPE_ETC_DIR)/makefiles/sketch.mk compile
build-arduino-nightly-package: build-arduino-nightly-package:
perl bin/build-arduino-package \ perl bin/build-arduino-package \
--kaleidoscope-tag=master \ --kaleidoscope-tag=master \

@ -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 # The clutter up the test output on Make 4.0 and newer
MAKEFLAGS += --no-print-directory MAKEFLAGS += --no-print-directory
include $(top_dir)/etc/makefiles/arduino-cli.mk 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 # If we start off in tests to run make all, the sketch makefiles guess the wrong location for
# Kaliedoscope's makefiles # Kaliedoscope's makefiles
KALEIDOSCOPE_ETC_DIR ?= $(top_dir)/etc KALEIDOSCOPE_ETC_DIR ?= $(top_dir)/etc
.PHONY: all .PHONY: all
all: ${libcommon_a} googletest ${TESTS} all: ${libcommon_a} googletest ${TESTS}
@: @:
@ -64,8 +59,6 @@ run-all: ${TESTS}
done; \ done; \
if [ -n $${ERROR} ]; then exit $${ERROR}; fi if [ -n $${ERROR} ]; then exit $${ERROR}; fi
.PHONY: clean .PHONY: clean
clean: cmake-clean clean: cmake-clean
@for test in ${TESTS}; do \ @for test in ${TESTS}; do \

Loading…
Cancel
Save