Chibios: add 'core/protocol' to the makefiles' search path.

flabbergast · flabbergast · commit a35cdea645e3 · 2015-12-30T10:46:08.000+01:00
diff --git a/tool/chibios/chibios.mk b/tool/chibios/chibios.mk
@@ -152,7 +152,7 @@ INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
          $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
          $(CHIBIOS)/os/hal/lib/streams $(CHIBIOS)/os/various \
          $(TMK_DIR) $(COMMON_DIR) $(TMK_DIR)/protocol/chibios \
-         $(TARGET_DIR)
+         $(TMK_DIR)/protocol $(TARGET_DIR)
 
 #
 # Project, sources and paths
diff --git a/tool/chibios/common.mk b/tool/chibios/common.mk
@@ -83,6 +83,3 @@ OPT_DEFS += -DVERSION=$(shell (git describe --always --dirty || echo 'unknown')
 ifdef BOOTLOADER_ADDRESS
     OPT_DEFS += -DBOOTLOADER_ADDRESS=$(BOOTLOADER_ADDRESS)
 endif
-
-# Search Path
-VPATH += $(TMK_DIR)/common

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \`
`152`	`152`	`$(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \`
`153`	`153`	`$(CHIBIOS)/os/hal/lib/streams $(CHIBIOS)/os/various \`
`154`	`154`	`$(TMK_DIR) $(COMMON_DIR) $(TMK_DIR)/protocol/chibios \`
`155`		`- $(TARGET_DIR)`
	`155`	`+ $(TMK_DIR)/protocol $(TARGET_DIR)`
`156`	`156`
`157`	`157`	`#`
`158`	`158`	`# Project, sources and paths`