diff --git a/firmware/Makefile b/firmware/Makefile index 8a79e9cdbd..f0d7e97c6a 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -295,10 +295,7 @@ INCDIR = $(CHIBIOS)/os/license \ ext \ ext_algo \ console_util \ - console \ - $(PROJECT_DIR)/console/binary \ - $(PROJECT_DIR)/console/binary_log \ - $(PROJECT_DIR)/console/fl_binary \ + $(CONSOLE_INC) \ $(PROJECT_DIR)/hw_layer \ $(PROJECT_DIR)/mass_storage \ $(PROJECT_DIR)/hw_layer/serial_over_usb \ diff --git a/firmware/console/console.mk b/firmware/console/console.mk index f0df04957d..cf96512c7b 100644 --- a/firmware/console/console.mk +++ b/firmware/console/console.mk @@ -8,3 +8,9 @@ CONSOLE_SRC_CPP = $(PROJECT_DIR)/console/status_loop.cpp \ $(PROJECT_DIR)/console/binary_log/log_field.cpp \ $(PROJECT_DIR)/console/binary_log/binary_logging.cpp \ + +CONSOLE_INC=\ + $(PROJECT_DIR)/console/binary \ + $(PROJECT_DIR)/console \ + $(PROJECT_DIR)/console/binary_log + diff --git a/simulator/Makefile b/simulator/Makefile index 7ce9ae89cf..4bd39eadda 100644 --- a/simulator/Makefile +++ b/simulator/Makefile @@ -188,10 +188,7 @@ INCDIR = . \ $(BOARDINC) \ $(UTIL_INC) \ $(PROJECT_DIR)/init \ - $(PROJECT_DIR)/console \ - $(PROJECT_DIR)/console/binary \ - $(PROJECT_DIR)/console/binary_log \ - $(PROJECT_DIR)/console/fl_binary \ + $(CONSOLE_INC) \ $(PROJECT_DIR)/config/engines \ $(PROJECT_DIR)/ext_algo \ $(HW_LAYER_DRIVERS_INC) \ diff --git a/unit_tests/Makefile b/unit_tests/Makefile index ad73b6e91b..7d7e5f88f6 100644 --- a/unit_tests/Makefile +++ b/unit_tests/Makefile @@ -99,6 +99,7 @@ PROJECT = rusefi_test include $(PROJECT_DIR)/config/engines/engines.mk include $(PROJECT_DIR)/controllers/controllers.mk include $(PROJECT_DIR)/development/development.mk +include $(PROJECT_DIR)/console/console.mk include $(PROJECT_DIR)/hw_layer/hw_layer.mk include $(PROJECT_DIR)/hw_layer/drivers/drivers.mk include $(PROJECT_DIR)/hw_layer/sensors/sensors.mk @@ -173,8 +174,7 @@ INCDIR = . \ $(UTIL_INC) \ $(PROJECT_DIR)/config/engines \ $(CONTROLLERS_INC) \ - $(PROJECT_DIR)/console \ - $(PROJECT_DIR)/console/binary_log \ + $(CONSOLE_INC) \ $(DEVELOPMENT_DIR) \ $(PROJECT_DIR)/ext_algo \ $(PROJECT_DIR)/hw_layer \