From 7f0357ffcb82ebcb59714cf977f139535a6f9efb Mon Sep 17 00:00:00 2001 From: rusefillc Date: Thu, 6 Jan 2022 20:06:31 -0500 Subject: [PATCH] mk files refactoring --- firmware/Makefile | 20 -------------------- firmware/common.mk | 22 +++++++++++++++++++++- firmware/controllers/system/system.mk | 2 -- simulator/Makefile | 17 ----------------- unit_tests/Makefile | 16 ---------------- 5 files changed, 21 insertions(+), 56 deletions(-) diff --git a/firmware/Makefile b/firmware/Makefile index 93216cadc7..528ca8987a 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -192,12 +192,6 @@ ifeq ($(USE_FATFS),yes) include $(PROJECT_DIR)/ext/fatfs.mk endif -include $(PROJECT_DIR)/config/engines/engines.mk -include $(PROJECT_DIR)/console/console.mk -include $(PROJECT_DIR)/controllers/controllers.mk -include $(PROJECT_DIR)/controllers/lua/lua.mk -include $(PROJECT_DIR)/development/development.mk -include $(PROJECT_DIR)/hw_layer/drivers/drivers.mk include $(PROJECT_DIR)/hw_layer/mass_storage/mass_storage.mk include $(PROJECT_DIR)/common.mk @@ -305,28 +299,14 @@ INCDIR = \ $(CHIBIOS)/os/various \ $(CHIBIOS)/os/hal/lib/peripherals/sensors \ $(CONFDIR) \ - config/engines \ - config/boards \ - config \ ext \ - ext_algo \ - console_util \ - $(CONSOLE_INC) \ - $(HW_LAYER_INC) \ $(PROJECT_DIR)/hw_layer/mass_storage \ $(PROJECT_DIR)/hw_layer/serial_over_usb \ - $(PROJECT_DIR)/hw_layer/algo \ $(PROJECT_DIR)/hw_layer/lcd \ $(PROJECT_DIR)/hw_layer/mass_storage \ - $(HW_SENSORS_INC) \ $(HW_INC) \ - $(HW_LAYER_DRIVERS_INC) \ - $(UTIL_INC) \ - init \ - $(DEVELOPMENT_DIR) \ development/hw_layer \ development/test \ - $(CONTROLLERS_INC) \ $(CHIBIOS_CONTRIB)/os/various # contrib/os/various must go at the end because it also contains pid.h which conflicts with our pid.h diff --git a/firmware/common.mk b/firmware/common.mk index e7818725f6..ab954912d6 100644 --- a/firmware/common.mk +++ b/firmware/common.mk @@ -1,6 +1,26 @@ include $(PROJECT_DIR)/init/init.mk include $(PROJECT_DIR)/util/util.mk +include $(PROJECT_DIR)/config/engines/engines.mk +include $(PROJECT_DIR)/console/console.mk +include $(PROJECT_DIR)/controllers/lua/lua.mk +include $(PROJECT_DIR)/controllers/controllers.mk +include $(PROJECT_DIR)/development/development.mk include $(PROJECT_DIR)/hw_layer/hw_layer.mk include $(PROJECT_DIR)/hw_layer/sensors/sensors.mk +include $(PROJECT_DIR)/hw_layer/drivers/drivers.mk -ALLINC += $(PROJECT_DIR)/console/binary/generated \ No newline at end of file +ALLINC += \ + $(CONSOLE_INC) \ + $(DEVELOPMENT_DIR) \ + $(PROJECT_DIR)/config/engines \ + $(PROJECT_DIR)/config/boards/ \ + $(PROJECT_DIR)/hw_layer/algo \ + $(PROJECT_DIR)/init \ + $(PROJECT_DIR)/ext_algo \ + $(HW_LAYER_DRIVERS_INC) \ + $(HW_LAYER_INC) \ + $(HW_SENSORS_INC) \ + $(UTIL_INC) \ + $(CONTROLLERS_INC) \ + $(PROJECT_DIR)/console/binary/generated \ + diff --git a/firmware/controllers/system/system.mk b/firmware/controllers/system/system.mk index da1415e26b..7df36135a6 100644 --- a/firmware/controllers/system/system.mk +++ b/firmware/controllers/system/system.mk @@ -1,6 +1,4 @@ -SYSTEMSRC = - SYSTEMSRC_CPP = \ $(PROJECT_DIR)/controllers/system/efi_gpio.cpp \ $(PROJECT_DIR)/controllers/system/periodic_task.cpp \ diff --git a/simulator/Makefile b/simulator/Makefile index 801b754a62..54164dcad5 100644 --- a/simulator/Makefile +++ b/simulator/Makefile @@ -152,11 +152,6 @@ endif include $(PROJECT_DIR)/console/binary/tunerstudio.mk include $(PROJECT_DIR)/console/console.mk -include $(PROJECT_DIR)/config/engines/engines.mk -include $(PROJECT_DIR)/controllers/controllers.mk -include $(PROJECT_DIR)/controllers/lua/lua.mk -include $(PROJECT_DIR)/development/development.mk -include $(PROJECT_DIR)/hw_layer/drivers/drivers.mk include $(PROJECT_DIR)/common.mk @@ -208,20 +203,8 @@ INCDIR = . \ $(PCH_DIR) \ $(ALLINC) \ $(CHIBIOS)/os/various/cpp_wrappers \ - $(UTIL_INC) \ - $(PROJECT_DIR)/init \ - $(CONSOLE_INC) \ - $(PROJECT_DIR)/config/engines \ - $(PROJECT_DIR)/config/boards/ \ - $(PROJECT_DIR)/ext_algo \ - $(HW_LAYER_DRIVERS_INC) \ - $(HW_LAYER_INC) \ - $(HW_SENSORS_INC) \ - $(PROJECT_DIR)/hw_layer/algo \ $(PROJECT_DIR)/hw_layer/drivers/can \ $(HW_SENSORS_INC) \ - $(DEVELOPMENT_DIR) \ - $(CONTROLLERS_INC) \ ${CHIBIOS}/os/various \ $(CHIBIOS)/os/hal/lib/streams \ simulator diff --git a/unit_tests/Makefile b/unit_tests/Makefile index b12164558e..1624760a2f 100644 --- a/unit_tests/Makefile +++ b/unit_tests/Makefile @@ -7,13 +7,8 @@ PROJECT_DIR = ../firmware UNIT_TESTS_DIR=$(PROJECT_DIR)/../unit_tests # Imported source files and paths -include $(PROJECT_DIR)/config/engines/engines.mk -include $(PROJECT_DIR)/controllers/controllers.mk -include $(PROJECT_DIR)/controllers/lua/lua.mk -include $(PROJECT_DIR)/development/development.mk include $(PROJECT_DIR)/console/console.mk include $(PROJECT_DIR)/console/binary/tunerstudio.mk -include $(PROJECT_DIR)/hw_layer/drivers/drivers.mk include $(UNIT_TESTS_DIR)/test.mk include $(UNIT_TESTS_DIR)/tests/tests.mk include $(PROJECT_DIR)/../unit_tests/tests/util/test_util.mk @@ -63,18 +58,7 @@ INCDIR += \ $(PCH_DIR) \ $(UNIT_TESTS_DIR) \ $(ALLINC) \ - $(UTIL_INC) \ - $(PROJECT_DIR)/config/engines \ - $(PROJECT_DIR)/config/boards/ \ - $(CONTROLLERS_INC) \ - $(CONSOLE_INC) \ - $(DEVELOPMENT_DIR) \ - $(PROJECT_DIR)/ext_algo \ - $(PROJECT_DIR)/init/ \ - $(PROJECT_DIR)/hw_layer/algo \ - $(HW_LAYER_INC) \ $(HW_SENSORS_INC) \ - $(HW_LAYER_DRIVERS_INC) \ $(UNIT_TESTS_DIR)/test_data_structures \ $(UNIT_TESTS_DIR)/chibios-mock \ $(UNIT_TESTS_DIR)/tests \