andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mk files refactoring

This commit is contained in:
rusefillc 2022-01-06 20:32:39 -05:00
parent a689f2ca0e
commit a13a0a2cc9
5 changed files with 16 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
firmware/Makefile
View File

@ -236,7 +236,6 @@ CSRC = check.c \
$(HW_LAYER_DRIVERS_CORE) \ $(HW_LAYER_DRIVERS_CORE) \
$(HW_LAYER_DRIVERS) \ $(HW_LAYER_DRIVERS) \
$(CONTROLLERSSRC) \ $(CONTROLLERSSRC) \
$(CONTROLLERS_ALGO_SRC) \
$(CONTROLLERS_CORE_SRC) \ $(CONTROLLERS_CORE_SRC) \
$(CONTROLLERS_SENSORS_SRC) \ $(CONTROLLERS_SENSORS_SRC) \
main_hardfault.c main_hardfault.c
@ -245,24 +244,11 @@ CSRC = check.c \
# setting. # setting.
CPPSRC = $(ALLCPPSRC) \ CPPSRC = $(ALLCPPSRC) \
$(BOARDCPPSRC) \ $(BOARDCPPSRC) \
$(TRIGGER_SRC_CPP) \
$(TRIGGER_DECODERS_SRC_CPP) \
$(DEV_SRC_CPP) \ $(DEV_SRC_CPP) \
$(CONTROLLERS_ALGO_SRC_CPP) \
$(UTILSRC_CPP) \
$(SYSTEMSRC_CPP) \
$(ENGINES_SRC_CPP) \
$(HW_LAYER_EMS_CPP) \
$(HW_LAYER_DRIVERS_CORE_CPP) \ $(HW_LAYER_DRIVERS_CORE_CPP) \
$(HW_LAYER_DRIVERS_CPP) \ $(HW_LAYER_DRIVERS_CPP) \
$(HW_SENSORS_CPP) \
$(TUNERSTUDIO_SRC_CPP) \
$(CONSOLE_SRC_CPP) \ $(CONSOLE_SRC_CPP) \
$(CONTROLLERS_SENSORS_SRC_CPP) \ $(CONTROLLERS_SENSORS_SRC_CPP) \
$(CONTROLLERS_SRC_CPP) \
$(CONTROLLERS_CORE_SRC_CPP) \
$(CONTROLLERS_MATH_SRC_CPP) \
$(INIT_SRC_CPP) \
rusefi.cpp \ rusefi.cpp \
main.cpp main.cpp

16
firmware/common.mk
View File

@ -9,6 +9,22 @@ include $(PROJECT_DIR)/hw_layer/hw_layer.mk
include $(PROJECT_DIR)/hw_layer/sensors/sensors.mk include $(PROJECT_DIR)/hw_layer/sensors/sensors.mk
include $(PROJECT_DIR)/hw_layer/drivers/drivers.mk include $(PROJECT_DIR)/hw_layer/drivers/drivers.mk
ALLCPPSRC += \
$(CONTROLLERS_CORE_SRC_CPP) \
$(CONTROLLERS_MATH_SRC_CPP) \
$(ENGINES_SRC_CPP) \
$(CONTROLLERS_ALGO_SRC_CPP) \
$(TUNERSTUDIO_SRC_CPP) \
$(HW_LAYER_EMS_CPP) \
$(HW_SENSORS_CPP) \
$(SYSTEMSRC_CPP) \
$(UTILSRC_CPP) \
$(TRIGGER_DECODERS_SRC_CPP) \
$(TRIGGER_SRC_CPP) \
$(CONTROLLERS_SRC_CPP) \
$(INIT_SRC_CPP) \
ALLINC += \ ALLINC += \
$(CONSOLE_INC) \ $(CONSOLE_INC) \
$(DEVELOPMENT_DIR) \ $(DEVELOPMENT_DIR) \

1
firmware/controllers/algo/algo.mk
View File

@ -1,4 +1,3 @@
CONTROLLERS_ALGO_SRC =
CONTROLLERS_ALGO_SRC_CPP = $(PROJECT_DIR)/controllers/algo/advance_map.cpp \ CONTROLLERS_ALGO_SRC_CPP = $(PROJECT_DIR)/controllers/algo/advance_map.cpp \
$(PROJECT_DIR)/controllers/algo/malfunction_central.cpp \ $(PROJECT_DIR)/controllers/algo/malfunction_central.cpp \

14
simulator/Makefile
View File

@ -160,7 +160,6 @@ include $(PROJECT_DIR)/common.mk
CSRC = $(ALLCSRC) \ CSRC = $(ALLCSRC) \
$(SYSTEMSRC) \ $(SYSTEMSRC) \
$(CONSOLESRC) \ $(CONSOLESRC) \
$(CONTROLLERS_ALGO_SRC) \
$(CONTROLLERS_CORE_SRC) \ $(CONTROLLERS_CORE_SRC) \
$(CONTROLLERS_SENSORS_SRC) \ $(CONTROLLERS_SENSORS_SRC) \
$(ENGINES_SRC) \ $(ENGINES_SRC) \
@ -171,25 +170,12 @@ CSRC = $(ALLCSRC) \
# setting. # setting.
CPPSRC = $(ALLCPPSRC) \ CPPSRC = $(ALLCPPSRC) \
$(CHIBIOS)/os/various/cpp_wrappers/ch.cpp \ $(CHIBIOS)/os/various/cpp_wrappers/ch.cpp \
$(UTILSRC_CPP) \
$(CONTROLLERS_ALGO_SRC_CPP) \
$(CONTROLLERS_SRC_CPP) \
$(PROJECT_DIR)/development/sensor_chart.cpp \ $(PROJECT_DIR)/development/sensor_chart.cpp \
$(HW_LAYER_EMS_CPP) \
$(HW_SENSORS_CPP) \
$(HW_LAYER_DRIVERS_CPP) \ $(HW_LAYER_DRIVERS_CPP) \
$(HW_LAYER_DRIVERS_CORE_CPP) \ $(HW_LAYER_DRIVERS_CORE_CPP) \
$(TRIGGER_SRC_CPP) \
$(TRIGGER_DECODERS_SRC_CPP) \
$(SYSTEMSRC_CPP) \
$(TUNERSTUDIO_SRC_CPP) \
$(CONSOLE_SRC_CPP) \ $(CONSOLE_SRC_CPP) \
$(INIT_SRC_CPP) \
$(CONTROLLERS_SENSORS_SRC_CPP) \ $(CONTROLLERS_SENSORS_SRC_CPP) \
$(CONTROLLERS_CORE_SRC_CPP) \
$(CONTROLLERS_MATH_SRC_CPP) \
$(DEV_SIMULATOR_SRC_CPP) \ $(DEV_SIMULATOR_SRC_CPP) \
$(ENGINES_SRC_CPP) \
simulator/rusEfiFunctionalTest.cpp \ simulator/rusEfiFunctionalTest.cpp \
simulator/framework.cpp \ simulator/framework.cpp \
simulator/boards.cpp \ simulator/boards.cpp \

14
unit_tests/Makefile
View File

@ -18,7 +18,6 @@ include $(PROJECT_DIR)/common.mk
# setting. # setting.
CSRC += $(ALLCSRC) \ CSRC += $(ALLCSRC) \
$(UTILSRC) \ $(UTILSRC) \
$(CONTROLLERS_ALGO_SRC) \
$(CONTROLLERS_CORE_SRC) \ $(CONTROLLERS_CORE_SRC) \
$(CONTROLLERS_MATH_SRC) \ $(CONTROLLERS_MATH_SRC) \
$(CONTROLLERS_SENSORS_SRC) \ $(CONTROLLERS_SENSORS_SRC) \
@ -29,23 +28,10 @@ CSRC += $(ALLCSRC) \
# C++ sources that can be compiled in ARM or THUMB mode depending on the global # C++ sources that can be compiled in ARM or THUMB mode depending on the global
# setting. # setting.
CPPSRC += $(ALLCPPSRC) \ CPPSRC += $(ALLCPPSRC) \
$(UTILSRC_CPP) \
$(CONTROLLERS_ALGO_SRC_CPP) \
$(TRIGGER_DECODERS_SRC_CPP) \
$(ENGINES_SRC_CPP) \
$(CONTROLLERS_SRC_CPP) \
$(HW_LAYER_DRIVERS_CORE_CPP) \ $(HW_LAYER_DRIVERS_CORE_CPP) \
$(CONTROLLERS_CORE_SRC_CPP) \
$(CONTROLLERS_MATH_SRC_CPP) \
$(CONTROLLERS_SENSORS_SRC_CPP) \ $(CONTROLLERS_SENSORS_SRC_CPP) \
$(FRAMEWORK_SRC_CPP) \ $(FRAMEWORK_SRC_CPP) \
$(TESTS_SRC_CPP) \ $(TESTS_SRC_CPP) \
$(SYSTEMSRC_CPP) \
$(HW_LAYER_EMS_CPP) \
$(TUNERSTUDIO_SRC_CPP) \
$(HW_SENSORS_CPP) \
$(TRIGGER_SRC_CPP) \
$(INIT_SRC_CPP) \
$(PROJECT_DIR)/../unit_tests/logicdata.cpp \ $(PROJECT_DIR)/../unit_tests/logicdata.cpp \
$(DEVELOPMENT_DIR)/engine_sniffer.cpp \ $(DEVELOPMENT_DIR)/engine_sniffer.cpp \
$(PROJECT_DIR)/../unit_tests/main.cpp \ $(PROJECT_DIR)/../unit_tests/main.cpp \