From ff99286daf560f1e9cd8e4c6ac01fe9fd9472f26 Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Tue, 17 Nov 2020 00:22:10 -0800 Subject: [PATCH] anotehr thing that will not work --- testing/makefiles/libcommon.mk | 5 +++-- tests/Makefile | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/testing/makefiles/libcommon.mk b/testing/makefiles/libcommon.mk index 82c88ff0..f8623bd5 100644 --- a/testing/makefiles/libcommon.mk +++ b/testing/makefiles/libcommon.mk @@ -3,7 +3,6 @@ build_dir := ${top_dir}/_build include $(top_dir)/etc/makefiles/arduino-cli.mk - bundle_path = ${ARDUINO_DIRECTORIES_USER}/hardware/keyboardio/avr/libraries LIB_DIR := ${build_dir}/lib @@ -17,6 +16,8 @@ LIB_FILE := libcommon.a .PHONY: all +DEFAULT_GOAL: all + all: ${OBJ_FILES} ${LIB_DIR}/${LIB_FILE} ${LIB_DIR}/${LIB_FILE}: ${OBJ_FILES} @@ -25,7 +26,7 @@ ${LIB_DIR}/${LIB_FILE}: ${OBJ_FILES} $(call _arduino_prop,compiler.ar.flags) "${LIB_DIR}/${LIB_FILE}" ${OBJ_FILES} ${OBJ_DIR}/%.o: ${top_dir}/testing/%.cpp ${H_FILES} - @echo "compile $@" + $(info compile $@) @install -d "${OBJ_DIR}" $(call _arduino_prop,compiler.cpp.cmd) -o "$@" -c \ -std=c++14 \ diff --git a/tests/Makefile b/tests/Makefile index 3196ae2c..cd135f19 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -42,7 +42,7 @@ ${top_dir}/testing/googletest/build/Makefile: install -d ${top_dir}/testing/googletest/build && cd ${top_dir}/testing/googletest/build && cmake .. ${libcommon_a}: - ${MAKE} -f ${top_dir}/testing/makefiles/libcommon.mk -C ${top_dir}/testing all + ${MAKE} -f ${top_dir}/testing/makefiles/libcommon.mk -C ${top_dir}/testing Makefile: @: