mk files refactoring

This commit is contained in:
rusefillc 2022-01-06 21:48:48 -05:00
parent c9e41d8f18
commit 04ab6a0488
5 changed files with 8 additions and 30 deletions

View File

@ -223,21 +223,12 @@ CSRC = check.c \
$(CHIBIOS)/os/various/syscalls.c \
$(CHIBIOS_CONTRIB)/os/various/ramdisk.c \
$(CHIBIOS)/os/various/evtimer.c \
$(TRIGGER_SRC) \
$(TRIGGER_DECODERS_SRC) \
$(DEV_SRC) \
$(BOOTLOADERSRC) \
${HW_MASS_STORAGE_SRC_C} \
$(UTILSRC) \
$(SYSTEMSRC) \
$(ENGINES_SRC) \
$(CONSOLESRC) \
$(HW_LAYER_EMS) \
$(HW_LAYER_DRIVERS_CORE) \
$(HW_LAYER_DRIVERS) \
$(CONTROLLERSSRC) \
$(CONTROLLERS_CORE_SRC) \
$(CONTROLLERS_SENSORS_SRC) \
main_hardfault.c
# C++ sources that can be compiled in ARM or THUMB mode depending on the global
@ -249,8 +240,7 @@ CPPSRC = \
$(HW_LAYER_DRIVERS_CORE_CPP) \
$(HW_LAYER_DRIVERS_CPP) \
$(CONSOLE_SRC_CPP) \
$(CONTROLLERS_SENSORS_SRC_CPP) \
rusefi.cpp \
rusefi.cpp \
main.cpp
# C sources to be compiled in ARM mode regardless of the global setting.

View File

@ -163,17 +163,14 @@ include $(PROJECT_DIR)/hw_layer/drivers/drivers.mk
CSRC = $(ALLCSRC) \
$(BOARDSRC) \
$(CHIBIOS)/os/various/syscalls.c \
$(CONSOLESRC) \
$(DEV_SRC) \
$(HW_LAYER_EMS) \
$(HW_LAYER_DRIVERS_CORE) \
$(FATFSSRC) \
$(SYSTEMSRC) \
# C++ sources that can be compiled in ARM or THUMB mode depending on the global
# setting.
CPPSRC = $(ALLCPPSRC) \
$(DEV_SRC_CPP) \
$(HW_LAYER_EMS_CPP) \
$(HW_SENSORS_SRC) \
$(TUNERSTUDIO_SRC_CPP) \

View File

@ -9,6 +9,10 @@ include $(PROJECT_DIR)/hw_layer/hw_layer.mk
include $(PROJECT_DIR)/hw_layer/sensors/sensors.mk
include $(PROJECT_DIR)/hw_layer/drivers/drivers.mk
ALLCSRC += \
$(UTILSRC) \
ALLCPPSRC += \
$(CONTROLLERS_CORE_SRC_CPP) \
$(CONTROLLERS_MATH_SRC_CPP) \

View File

@ -158,12 +158,6 @@ include $(PROJECT_DIR)/common.mk
# C sources that can be compiled in ARM or THUMB mode depending on the global
# setting.
CSRC = $(ALLCSRC) \
$(SYSTEMSRC) \
$(CONSOLESRC) \
$(CONTROLLERS_CORE_SRC) \
$(CONTROLLERS_SENSORS_SRC) \
$(ENGINES_SRC) \
$(UTILSRC) \
main.c
# C++ sources that can be compiled in ARM or THUMB mode depending on the global
@ -190,7 +184,6 @@ INCDIR = . \
$(ALLINC) \
$(CHIBIOS)/os/various/cpp_wrappers \
$(PROJECT_DIR)/hw_layer/drivers/can \
$(HW_SENSORS_INC) \
${CHIBIOS}/os/various \
$(CHIBIOS)/os/hal/lib/streams \
simulator

View File

@ -17,11 +17,6 @@ include $(PROJECT_DIR)/common.mk
# C sources that can be compiled in ARM or THUMB mode depending on the global
# setting.
CSRC += $(ALLCSRC) \
$(UTILSRC) \
$(CONTROLLERS_CORE_SRC) \
$(CONTROLLERS_MATH_SRC) \
$(CONTROLLERS_SENSORS_SRC) \
$(ENGINES_SRC) \
$(HW_LAYER_DRIVERS_CORE) \
$(TEST_SRC_C)
@ -32,19 +27,18 @@ CPPSRC += $(ALLCPPSRC) \
$(CONTROLLERS_SENSORS_SRC_CPP) \
$(FRAMEWORK_SRC_CPP) \
$(TESTS_SRC_CPP) \
$(PROJECT_DIR)/../unit_tests/logicdata.cpp \
$(DEVELOPMENT_DIR)/engine_sniffer.cpp \
$(PROJECT_DIR)/../unit_tests/main.cpp \
$(PROJECT_DIR)/../unit_tests/global_mocks.cpp \
$(PROJECT_DIR)/console/binary/tooth_logger.cpp \
$(PROJECT_DIR)/console/binary_log/log_field.cpp \
$(PROJECT_DIR)/../unit_tests/logicdata.cpp \
$(PROJECT_DIR)/../unit_tests/main.cpp \
$(PROJECT_DIR)/../unit_tests/global_mocks.cpp \
$(PROJECT_DIR)/../unit_tests/mocks.cpp \
INCDIR += \
$(PCH_DIR) \
$(UNIT_TESTS_DIR) \
$(ALLINC) \
$(HW_SENSORS_INC) \
$(UNIT_TESTS_DIR)/test_data_structures \
$(UNIT_TESTS_DIR)/chibios-mock \
$(UNIT_TESTS_DIR)/tests \