reducing duplication

This commit is contained in:
rusefi 2018-12-16 00:22:24 -05:00
parent 0a8e288304
commit f898d1c6c5
1 changed files with 5 additions and 4 deletions

View File

@ -3,7 +3,11 @@
# NOTE: Can be overridden externally. # NOTE: Can be overridden externally.
# #
ifeq ("$(wildcard ChibiOS4/os/common/startup/ARMCMx/compilers/GCC/rules.mk)","") CHIBIOS = ChibiOS4
RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
RULESFILE = $(RULESPATH)/rules.mk
ifeq ("$(wildcard $(RULESFILE))","")
# #
# todo: someone please figure out the syntax to invoke 'git submodule update --init' from here # todo: someone please figure out the syntax to invoke 'git submodule update --init' from here
# #
@ -108,7 +112,6 @@ PROJECT = rusefi
PROJECT_DIR = . PROJECT_DIR = .
# Imported source files and paths # Imported source files and paths
CHIBIOS = ChibiOS4
CHIBIOS_CONTRIB = ChibiOS-Contrib CHIBIOS_CONTRIB = ChibiOS-Contrib
ifeq ($(PROJECT_BOARD),) ifeq ($(PROJECT_BOARD),)
@ -357,6 +360,4 @@ ULIBS = -lm
# End of user defines # End of user defines
############################################################################## ##############################################################################
RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC
RULESFILE = $(RULESPATH)/rules.mk
include $(RULESFILE) include $(RULESFILE)