mirror of https://github.com/rusefi/rusefi-1.git
mk files refactoring
This commit is contained in:
parent
02ec63334e
commit
7f0357ffcb
|
@ -192,12 +192,6 @@ ifeq ($(USE_FATFS),yes)
|
||||||
include $(PROJECT_DIR)/ext/fatfs.mk
|
include $(PROJECT_DIR)/ext/fatfs.mk
|
||||||
endif
|
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)/hw_layer/mass_storage/mass_storage.mk
|
||||||
include $(PROJECT_DIR)/common.mk
|
include $(PROJECT_DIR)/common.mk
|
||||||
|
|
||||||
|
@ -305,28 +299,14 @@ INCDIR = \
|
||||||
$(CHIBIOS)/os/various \
|
$(CHIBIOS)/os/various \
|
||||||
$(CHIBIOS)/os/hal/lib/peripherals/sensors \
|
$(CHIBIOS)/os/hal/lib/peripherals/sensors \
|
||||||
$(CONFDIR) \
|
$(CONFDIR) \
|
||||||
config/engines \
|
|
||||||
config/boards \
|
|
||||||
config \
|
|
||||||
ext \
|
ext \
|
||||||
ext_algo \
|
|
||||||
console_util \
|
|
||||||
$(CONSOLE_INC) \
|
|
||||||
$(HW_LAYER_INC) \
|
|
||||||
$(PROJECT_DIR)/hw_layer/mass_storage \
|
$(PROJECT_DIR)/hw_layer/mass_storage \
|
||||||
$(PROJECT_DIR)/hw_layer/serial_over_usb \
|
$(PROJECT_DIR)/hw_layer/serial_over_usb \
|
||||||
$(PROJECT_DIR)/hw_layer/algo \
|
|
||||||
$(PROJECT_DIR)/hw_layer/lcd \
|
$(PROJECT_DIR)/hw_layer/lcd \
|
||||||
$(PROJECT_DIR)/hw_layer/mass_storage \
|
$(PROJECT_DIR)/hw_layer/mass_storage \
|
||||||
$(HW_SENSORS_INC) \
|
|
||||||
$(HW_INC) \
|
$(HW_INC) \
|
||||||
$(HW_LAYER_DRIVERS_INC) \
|
|
||||||
$(UTIL_INC) \
|
|
||||||
init \
|
|
||||||
$(DEVELOPMENT_DIR) \
|
|
||||||
development/hw_layer \
|
development/hw_layer \
|
||||||
development/test \
|
development/test \
|
||||||
$(CONTROLLERS_INC) \
|
|
||||||
$(CHIBIOS_CONTRIB)/os/various
|
$(CHIBIOS_CONTRIB)/os/various
|
||||||
# contrib/os/various must go at the end because it also contains pid.h which conflicts with our pid.h
|
# contrib/os/various must go at the end because it also contains pid.h which conflicts with our pid.h
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,26 @@
|
||||||
include $(PROJECT_DIR)/init/init.mk
|
include $(PROJECT_DIR)/init/init.mk
|
||||||
include $(PROJECT_DIR)/util/util.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/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
|
||||||
|
|
||||||
|
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 \
|
||||||
|
|
||||||
ALLINC += $(PROJECT_DIR)/console/binary/generated
|
|
|
@ -1,6 +1,4 @@
|
||||||
|
|
||||||
SYSTEMSRC =
|
|
||||||
|
|
||||||
SYSTEMSRC_CPP = \
|
SYSTEMSRC_CPP = \
|
||||||
$(PROJECT_DIR)/controllers/system/efi_gpio.cpp \
|
$(PROJECT_DIR)/controllers/system/efi_gpio.cpp \
|
||||||
$(PROJECT_DIR)/controllers/system/periodic_task.cpp \
|
$(PROJECT_DIR)/controllers/system/periodic_task.cpp \
|
||||||
|
|
|
@ -152,11 +152,6 @@ endif
|
||||||
|
|
||||||
include $(PROJECT_DIR)/console/binary/tunerstudio.mk
|
include $(PROJECT_DIR)/console/binary/tunerstudio.mk
|
||||||
include $(PROJECT_DIR)/console/console.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
|
include $(PROJECT_DIR)/common.mk
|
||||||
|
|
||||||
|
|
||||||
|
@ -208,20 +203,8 @@ INCDIR = . \
|
||||||
$(PCH_DIR) \
|
$(PCH_DIR) \
|
||||||
$(ALLINC) \
|
$(ALLINC) \
|
||||||
$(CHIBIOS)/os/various/cpp_wrappers \
|
$(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 \
|
$(PROJECT_DIR)/hw_layer/drivers/can \
|
||||||
$(HW_SENSORS_INC) \
|
$(HW_SENSORS_INC) \
|
||||||
$(DEVELOPMENT_DIR) \
|
|
||||||
$(CONTROLLERS_INC) \
|
|
||||||
${CHIBIOS}/os/various \
|
${CHIBIOS}/os/various \
|
||||||
$(CHIBIOS)/os/hal/lib/streams \
|
$(CHIBIOS)/os/hal/lib/streams \
|
||||||
simulator
|
simulator
|
||||||
|
|
|
@ -7,13 +7,8 @@ PROJECT_DIR = ../firmware
|
||||||
UNIT_TESTS_DIR=$(PROJECT_DIR)/../unit_tests
|
UNIT_TESTS_DIR=$(PROJECT_DIR)/../unit_tests
|
||||||
|
|
||||||
# Imported source files and paths
|
# 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/console.mk
|
||||||
include $(PROJECT_DIR)/console/binary/tunerstudio.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)/test.mk
|
||||||
include $(UNIT_TESTS_DIR)/tests/tests.mk
|
include $(UNIT_TESTS_DIR)/tests/tests.mk
|
||||||
include $(PROJECT_DIR)/../unit_tests/tests/util/test_util.mk
|
include $(PROJECT_DIR)/../unit_tests/tests/util/test_util.mk
|
||||||
|
@ -63,18 +58,7 @@ INCDIR += \
|
||||||
$(PCH_DIR) \
|
$(PCH_DIR) \
|
||||||
$(UNIT_TESTS_DIR) \
|
$(UNIT_TESTS_DIR) \
|
||||||
$(ALLINC) \
|
$(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_SENSORS_INC) \
|
||||||
$(HW_LAYER_DRIVERS_INC) \
|
|
||||||
$(UNIT_TESTS_DIR)/test_data_structures \
|
$(UNIT_TESTS_DIR)/test_data_structures \
|
||||||
$(UNIT_TESTS_DIR)/chibios-mock \
|
$(UNIT_TESTS_DIR)/chibios-mock \
|
||||||
$(UNIT_TESTS_DIR)/tests \
|
$(UNIT_TESTS_DIR)/tests \
|
||||||
|
|
Loading…
Reference in New Issue