[make] rename INCLUDES -> GLOBAL_INCLUDES

To be more consistent, rename make variable INCLUDES to GLOBAL_INCLUDES. Also remove the need to put -I in front of each field, the make system will do that for you. To fix your module makefiles: -Change INCLUDES -> GLOBAL_INCLUDES -Remove -I prefix
2013-06-07 21:51:36 -07:00
parent e0c059c034
commit e002c58b59
37 changed files with 69 additions and 73 deletions
--- a/app/pcitests/rules.mk
+++ b/app/pcitests/rules.mk
@@ -2,7 +2,7 @@ LOCAL_DIR := $(GET_LOCAL_DIR)

 MODULE := $(LOCAL_DIR)

-#INCLUDES += -I$(LOCAL_DIR)/include
+#GLOBAL_INCLUDES += $(LOCAL_DIR)/include

 MODULE_SRCS += \
 	$(LOCAL_DIR)/pci_tests.c 
--- a/app/tests/rules.mk
+++ b/app/tests/rules.mk
@@ -2,7 +2,7 @@ LOCAL_DIR := $(GET_LOCAL_DIR)

 MODULE := $(LOCAL_DIR)

-INCLUDES += -I$(LOCAL_DIR)/include
+GLOBAL_INCLUDES += $(LOCAL_DIR)/include

 MODULE_SRCS += \
 	$(LOCAL_DIR)/tests.c \
--- a/arch/arm/rules.mk
+++ b/arch/arm/rules.mk
@@ -128,9 +128,9 @@ THUMBCFLAGS := -mthumb -D__thumb__
 THUMBINTERWORK := -mthumb-interwork
 endif

-INCLUDES += \
-	-I$(LOCAL_DIR)/include \
-	-I$(LOCAL_DIR)/$(SUBARCH)/include
+GLOBAL_INCLUDES += \
+	$(LOCAL_DIR)/include \
+	$(LOCAL_DIR)/$(SUBARCH)/include

 ifeq ($(SUBARCH),arm)
 MODULE_SRCS += \
@@ -160,8 +160,8 @@ MODULE_SRCS += \
 	$(LOCAL_DIR)/arm-m/thread.c \
 	$(LOCAL_DIR)/arm-m/systick.c

-INCLUDES += \
-	-I$(LOCAL_DIR)/arm-m/CMSIS/Include
+GLOBAL_INCLUDES += \
+	$(LOCAL_DIR)/arm-m/CMSIS/Include

 DEFINES += \
 	ARCH_DEFAULT_STACK_SIZE=1024
--- a/arch/x86/rules.mk
+++ b/arch/x86/rules.mk
@@ -2,8 +2,8 @@ LOCAL_DIR := $(GET_LOCAL_DIR)

 MODULE := $(LOCAL_DIR)

-INCLUDES += \
-	-I$(LOCAL_DIR)/include
+GLOBAL_INCLUDES += \
+	$(LOCAL_DIR)/include

 MODULE_SRCS += \
 	$(LOCAL_DIR)/crt0.S \
--- a/dev/net/smc91c96/rules.mk
+++ b/dev/net/smc91c96/rules.mk
@@ -2,8 +2,8 @@ LOCAL_DIR := $(GET_LOCAL_DIR)

 MODULE := $(LOCAL_DIR)

-INCLUDES += \
-	-I$(LOCAL_DIR)/include
+GLOBAL_INCLUDES += \
+	$(LOCAL_DIR)/include

 MODULE_SRCS += \
 	$(LOCAL_DIR)/smc91c96.c
--- a/dev/pmic/twl4030/rules.mk
+++ b/dev/pmic/twl4030/rules.mk
@@ -2,7 +2,7 @@ LOCAL_DIR := $(GET_LOCAL_DIR)

 MODULE := $(LOCAL_DIR)

-INCLUDES += -I$(LOCAL_DIR)/include
+GLOBAL_INCLUDES += $(LOCAL_DIR)/include

 MODULE_SRCS += \
 	$(LOCAL_DIR)/twl4030.c
--- a/engine.mk
+++ b/engine.mk
@@ -43,7 +43,7 @@ OUTBIN := $(BUILDDIR)/lk.bin
 OUTELF := $(BUILDDIR)/lk.elf
 CONFIGHEADER := $(BUILDDIR)/config.h

-INCLUDES := -I$(BUILDDIR) -I$(LKROOT)/include $(addsuffix /include,$(addprefix -I,$(LKINC)))
+GLOBAL_INCLUDES := $(BUILDDIR) $(LKROOT)/include $(addsuffix /include,$(LKINC))
 GLOBAL_OPTFLAGS ?= -Os
 GLOBAL_COMPILEFLAGS := -g -finline -W -Wall -Wno-multichar -Wno-unused-parameter -Wno-unused-function -include $(CONFIGHEADER)
 GLOBAL_CFLAGS := --std=gnu99 -Werror-implicit-function-declaration
@@ -154,7 +154,8 @@ endif

 DEPS := $(ALLOBJS:%o=%d)

-#$(warning DEPS=$(DEPS))
+# prefix all of the paths in GLOBAL_INCLUDES with -I
+GLOBAL_INCLUDES := $(addprefix -I,$(GLOBAL_INCLUDES))

 # default to no ccache
 CCACHE ?=
@@ -167,7 +168,7 @@ SIZE := $(TOOLCHAIN_PREFIX)size
 NM := $(TOOLCHAIN_PREFIX)nm

 # put all of the global build flags in config.h to force a rebuild if any change
-DEFINES += INCLUDES=\"$(subst $(SPACE),_,$(INCLUDES))\"
+DEFINES += GLOBAL_INCLUDES=\"$(subst $(SPACE),_,$(GLOBAL_INCLUDES))\"
 DEFINES += GLOBAL_COMPILEFLAGS=\"$(subst $(SPACE),_,$(GLOBAL_COMPILEFLAGS))\"
 DEFINES += GLOBAL_OPTFLAGS=\"$(subst $(SPACE),_,$(GLOBAL_OPTFLAGS))\"
 DEFINES += GLOBAL_CFLAGS=\"$(subst $(SPACE),_,$(GLOBAL_CFLAGS))\"
@@ -178,8 +179,6 @@ DEFINES += GLOBAL_LDFLAGS=\"$(subst $(SPACE),_,$(GLOBAL_LDFLAGS))\"
 # comment out or override if you want to see the full output of each command
 NOECHO ?= @

-#$(warning ALLMODULE_OBJS=$(ALLMODULE_OBJS))
-
 ifneq ($(OBJS),)
 $(warning OBJS=$(OBJS))
 $(error OBJS is not empty, please convert to new module format)
--- a/lib/console/rules.mk
+++ b/lib/console/rules.mk
@@ -2,7 +2,7 @@ LOCAL_DIR := $(GET_LOCAL_DIR)

 MODULE := $(LOCAL_DIR)

-INCLUDES += -I$(LOCAL_DIR)/include
+GLOBAL_INCLUDES += $(LOCAL_DIR)/include

 MODULE_SRCS += \
 	$(LOCAL_DIR)/console.c
--- a/make/build.mk
+++ b/make/build.mk
@@ -1,6 +1,3 @@
-# comment out or override if you want to see the full output of each command
-NOECHO ?= @
-
 $(OUTBIN): $(OUTELF)
 	@echo generating image: $@
 	$(NOECHO)$(SIZE) $<
--- a/make/compile.mk
+++ b/make/compile.mk
@@ -43,33 +43,33 @@ $(MODULE_OBJS): $(MODULE_SRCDEPS) $(SRCDEPS)
 $(MODULE_COBJS): $(BUILDDIR)/%.o: %.c $(SRCDEPS)
 	@$(MKDIR)
 	@echo compiling $<
-	$(NOECHO)$(CC) $(GLOBAL_OPTFLAGS) $(MODULE_OPTFLAGS) $(GLOBAL_COMPILEFLAGS) $(MODULE_COMPILEFLAGS) $(GLOBAL_CFLAGS) $(MODULE_CFLAGS) $(THUMBCFLAGS) $(INCLUDES) $(MODULE_INCLUDES) -c $< -MD -MT $@ -MF $(@:%o=%d) -o $@
+	$(NOECHO)$(CC) $(GLOBAL_OPTFLAGS) $(MODULE_OPTFLAGS) $(GLOBAL_COMPILEFLAGS) $(MODULE_COMPILEFLAGS) $(GLOBAL_CFLAGS) $(MODULE_CFLAGS) $(THUMBCFLAGS) $(GLOBAL_INCLUDES) $(MODULE_INCLUDES) -c $< -MD -MT $@ -MF $(@:%o=%d) -o $@

 $(MODULE_CPPOBJS): $(BUILDDIR)/%.o: %.cpp $(SRCDEPS)
 	@$(MKDIR)
 	@echo compiling $<
-	$(NOECHO)$(CC) $(GLOBAL_OPTFLAGS) $(MODULE_OPTFLAGS) $(GLOBAL_COMPILEFLAGS) $(MODULE_COMPILEFLAGS) $(GLOBAL_CPPFLAGS) $(MODULE_CPPFLAGS) $(THUMBCFLAGS) $(INCLUDES) $(MODULE_INCLUDES) -c $< -MD -MT $@ -MF $(@:%o=%d) -o $@
+	$(NOECHO)$(CC) $(GLOBAL_OPTFLAGS) $(MODULE_OPTFLAGS) $(GLOBAL_COMPILEFLAGS) $(MODULE_COMPILEFLAGS) $(GLOBAL_CPPFLAGS) $(MODULE_CPPFLAGS) $(THUMBCFLAGS) $(GLOBAL_INCLUDES) $(MODULE_INCLUDES) -c $< -MD -MT $@ -MF $(@:%o=%d) -o $@

 $(MODULE_ASMOBJS): $(BUILDDIR)/%.o: %.S $(SRCDEPS)
 	@$(MKDIR)
 	@echo compiling $<
-	$(NOECHO)$(CC) $(GLOBAL_OPTFLAGS) $(MODULE_OPTFLAGS) $(GLOBAL_COMPILEFLAGS) $(MODULE_COMPILEFLAGS) $(GLOBAL_ASMFLAGS) $(MODULE_ASMFLAGS) $(THUMBCFLAGS) $(INCLUDES) $(MODULE_INCLUDES) -c $< -MD -MT $@ -MF $(@:%o=%d) -o $@
+	$(NOECHO)$(CC) $(GLOBAL_OPTFLAGS) $(MODULE_OPTFLAGS) $(GLOBAL_COMPILEFLAGS) $(MODULE_COMPILEFLAGS) $(GLOBAL_ASMFLAGS) $(MODULE_ASMFLAGS) $(THUMBCFLAGS) $(GLOBAL_INCLUDES) $(MODULE_INCLUDES) -c $< -MD -MT $@ -MF $(@:%o=%d) -o $@

 # overridden arm versions
 $(MODULE_ARM_COBJS): $(BUILDDIR)/%.o: %.c $(SRCDEPS)
 	@$(MKDIR)
 	@echo compiling $<
-	$(NOECHO)$(CC) $(GLOBAL_OPTFLAGS) $(MODULE_OPTFLAGS) $(GLOBAL_COMPILEFLAGS) $(MODULE_COMPILEFLAGS) $(GLOBAL_CFLAGS) $(MODULE_CFLAGS) $(INCLUDES) $(MODULE_INCLUDES) -c $< -MD -MT $@ -MF $(@:%o=%d) -o $@
+	$(NOECHO)$(CC) $(GLOBAL_OPTFLAGS) $(MODULE_OPTFLAGS) $(GLOBAL_COMPILEFLAGS) $(MODULE_COMPILEFLAGS) $(GLOBAL_CFLAGS) $(MODULE_CFLAGS) $(GLOBAL_INCLUDES) $(MODULE_INCLUDES) -c $< -MD -MT $@ -MF $(@:%o=%d) -o $@

 $(MODULE_ARM_CPPOBJS): $(BUILDDIR)/%.o: %.cpp $(SRCDEPS)
 	@$(MKDIR)
 	@echo compiling $<
-	$(NOECHO)$(CC) $(GLOBAL_OPTFLAGS) $(MODULE_OPTFLAGS) $(GLOBAL_COMPILEFLAGS) $(MODULE_COMPILEFLAGS) $(GLOBAL_CPPFLAGS) $(MODULE_CPPFLAGS) $(INCLUDES) $(MODULE_INCLUDES) -c $< -MD -MT $@ -MF $(@:%o=%d) -o $@
+	$(NOECHO)$(CC) $(GLOBAL_OPTFLAGS) $(MODULE_OPTFLAGS) $(GLOBAL_COMPILEFLAGS) $(MODULE_COMPILEFLAGS) $(GLOBAL_CPPFLAGS) $(MODULE_CPPFLAGS) $(GLOBAL_INCLUDES) $(MODULE_INCLUDES) -c $< -MD -MT $@ -MF $(@:%o=%d) -o $@

 $(MODULE_ARM_ASMOBJS): $(BUILDDIR)/%.o: %.S $(SRCDEPS)
 	@$(MKDIR)
 	@echo compiling $<
-	$(NOECHO)$(CC) $(GLOBAL_OPTFLAGS) $(MODULE_OPTFLAGS) $(GLOBAL_COMPILEFLAGS) $(MODULE_COMPILEFLAGS) $(GLOBAL_ASMFLAGS) $(MODULE_ASMFLAGS) $(INCLUDES) $(MODULE_INCLUDES) -c $< -MD -MT $@ -MF $(@:%o=%d) -o $@
+	$(NOECHO)$(CC) $(GLOBAL_OPTFLAGS) $(MODULE_OPTFLAGS) $(GLOBAL_COMPILEFLAGS) $(MODULE_COMPILEFLAGS) $(GLOBAL_ASMFLAGS) $(MODULE_ASMFLAGS) $(GLOBAL_INCLUDES) $(MODULE_INCLUDES) -c $< -MD -MT $@ -MF $(@:%o=%d) -o $@

 # clear some variables we set here
 MODULE_CSRCS :=
--- a/platform/am335x/rules.mk
+++ b/platform/am335x/rules.mk
@@ -8,12 +8,12 @@ CPU := generic

 ENABLE_THUMB := false

-INCLUDES += \
-	-I$(LOCAL_DIR)/include \
-	-I$(LOCAL_DIR)/ti/include \
-	-I$(LOCAL_DIR)/ti/include/hw \
-	-I$(LOCAL_DIR)/ti/include/armv7a \
-	-I$(LOCAL_DIR)/ti/include/armv7a/am335x \
+GLOBAL_INCLUDES += \
+	$(LOCAL_DIR)/include \
+	$(LOCAL_DIR)/ti/include \
+	$(LOCAL_DIR)/ti/include/hw \
+	$(LOCAL_DIR)/ti/include/armv7a \
+	$(LOCAL_DIR)/ti/include/armv7a/am335x \

 MODULE_SRCS += \
 	$(LOCAL_DIR)/debug.c \
--- a/platform/armemu/rules.mk
+++ b/platform/armemu/rules.mk
@@ -9,8 +9,8 @@ CPU := generic
 # emulater doesn't support thumb properly
 ENABLE_THUMB := false

-INCLUDES += \
-	-I$(LOCAL_DIR)/include
+GLOBAL_INCLUDES += \
+	$(LOCAL_DIR)/include

 MODULE_SRCS += \
 	$(LOCAL_DIR)/debug.c \
--- a/platform/omap3/rules.mk
+++ b/platform/omap3/rules.mk
@@ -16,8 +16,8 @@ DEFINES += \
 MODULE_DEPS += \
 	dev/usb

-INCLUDES += \
-	-I$(LOCAL_DIR)/include
+GLOBAL_INCLUDES += \
+	$(LOCAL_DIR)/include

 MODULE_SRCS += \
 	$(LOCAL_DIR)/cpu_early_init.S \
--- a/platform/omap5912/rules.mk
+++ b/platform/omap5912/rules.mk
@@ -9,8 +9,8 @@ CPU := generic
 MODULE_DEPS += \
 	lib/cbuf

-INCLUDES += \
-	-I$(LOCAL_DIR)/include
+GLOBAL_INCLUDES += \
+	$(LOCAL_DIR)/include

 MODULE_SRCS += \
 	$(LOCAL_DIR)/debug.c \
--- a/platform/pc/rules.mk
+++ b/platform/pc/rules.mk
@@ -8,8 +8,8 @@ CPU := generic
 MODULE_DEPS += \
 	lib/cbuf

-INCLUDES += \
-	-I$(LOCAL_DIR)/include
+GLOBAL_INCLUDES += \
+	$(LOCAL_DIR)/include

 MODULE_SRCS += \
 	$(LOCAL_DIR)/interrupts.c \
--- a/platform/realview-pb/rules.mk
+++ b/platform/realview-pb/rules.mk
@@ -5,8 +5,8 @@ MODULE := $(LOCAL_DIR)
 ARCH := arm
 ARM_CPU := cortex-a8

-INCLUDES += \
-	-I$(LOCAL_DIR)/include
+GLOBAL_INCLUDES += \
+	$(LOCAL_DIR)/include

 MODULE_SRCS += \
 	$(LOCAL_DIR)/debug.c \
--- a/platform/sam3/cmsis/sam3x/rules.mk
+++ b/platform/sam3/cmsis/sam3x/rules.mk
@@ -1,7 +1,7 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)

-INCLUDES += -I$(LOCAL_DIR)/include
-INCLUDES += -I$(LOCAL_DIR)/source/templates
+GLOBAL_INCLUDES += $(LOCAL_DIR)/include
+GLOBAL_INCLUDES += $(LOCAL_DIR)/source/templates

 MODULE_SRCS += \
 	$(LOCAL_DIR)/source/templates/system_sam3x.c \
--- a/platform/sam3/drivers/rules.mk
+++ b/platform/sam3/drivers/rules.mk
@@ -1,7 +1,7 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)

-INCLUDES += \
-	-I$(LOCAL_DIR)
+GLOBAL_INCLUDES += \
+	$(LOCAL_DIR)

 MODULE_SRCS += \
 	$(LOCAL_DIR)/pio/pio.c \
--- a/platform/sam3/rules.mk
+++ b/platform/sam3/rules.mk
@@ -21,8 +21,8 @@ ifeq ($(MEMSIZE),)
 $(error need to define MEMSIZE)
 endif

-INCLUDES += \
-	-I$(LOCAL_DIR)/include
+GLOBAL_INCLUDES += \
+	$(LOCAL_DIR)/include

 MODULE_SRCS += \
 	$(LOCAL_DIR)/init.c \
--- a/platform/stellaris/rules.mk
+++ b/platform/stellaris/rules.mk
@@ -24,8 +24,8 @@ ifeq ($(MEMSIZE),)
 $(error need to define MEMSIZE)
 endif

-INCLUDES += \
-	-I$(LOCAL_DIR)/include \
+GLOBAL_INCLUDES += \
+	$(LOCAL_DIR)/include \

 MODULE_SRCS += \
 	$(LOCAL_DIR)/debug.c \
--- a/platform/stellaris/ti/rules.mk
+++ b/platform/stellaris/ti/rules.mk
@@ -1,6 +1,6 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)

-INCLUDES += -I$(LOCAL_DIR)
+GLOBAL_INCLUDES += $(LOCAL_DIR)

 MODULE_SRCS += \
 	$(LOCAL_DIR)/driverlib/adc.c \
--- a/platform/stm32f1xx/CMSIS/rules.mk
+++ b/platform/stm32f1xx/CMSIS/rules.mk
@@ -1,4 +1,4 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)

-INCLUDES += -I$(LOCAL_DIR)
+GLOBAL_INCLUDES += $(LOCAL_DIR)

--- a/platform/stm32f1xx/STM32F10x_StdPeriph_Driver/rules.mk
+++ b/platform/stm32f1xx/STM32F10x_StdPeriph_Driver/rules.mk
@@ -1,6 +1,6 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)

-INCLUDES += -I$(LOCAL_DIR)/inc
+GLOBAL_INCLUDES += $(LOCAL_DIR)/inc

 MODULE_SRCS += \
 	$(LOCAL_DIR)/src/misc.c \
--- a/platform/stm32f1xx/rules.mk
+++ b/platform/stm32f1xx/rules.mk
@@ -39,8 +39,8 @@ endif
 DEFINES += \
 	MEMSIZE=$(MEMSIZE)

-INCLUDES += \
-	-I$(LOCAL_DIR)/include
+GLOBAL_INCLUDES += \
+	$(LOCAL_DIR)/include

 MODULE_SRCS += \
 	$(LOCAL_DIR)/init.c \
--- a/platform/stm32f2xx/CMSIS/rules.mk
+++ b/platform/stm32f2xx/CMSIS/rules.mk
@@ -1,4 +1,4 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)

-INCLUDES += -I$(LOCAL_DIR)
+GLOBAL_INCLUDES += $(LOCAL_DIR)

--- a/platform/stm32f2xx/STM32F2xx_StdPeriph_Driver/rules.mk
+++ b/platform/stm32f2xx/STM32F2xx_StdPeriph_Driver/rules.mk
@@ -1,6 +1,6 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)

-INCLUDES += -I$(LOCAL_DIR)/inc
+GLOBAL_INCLUDES += $(LOCAL_DIR)/inc

 MODULE_SRCS += \
 	$(LOCAL_DIR)/src/system_stm32f2xx.c \
--- a/platform/stm32f2xx/rules.mk
+++ b/platform/stm32f2xx/rules.mk
@@ -33,8 +33,8 @@ endif
 DEFINES += \
 	MEMSIZE=$(MEMSIZE)

-INCLUDES += \
-	-I$(LOCAL_DIR)/include
+GLOBAL_INCLUDES += \
+	$(LOCAL_DIR)/include

 MODULE_SRCS += \
 	$(LOCAL_DIR)/init.c \
--- a/target/adk2012/rules.mk
+++ b/target/adk2012/rules.mk
@@ -5,7 +5,7 @@ MODULE := $(LOCAL_DIR)
 SAM_CHIP := sam3x8h
 PLATFORM := sam3

-INCLUDES += -I$(LOCAL_DIR)/include
+GLOBAL_INCLUDES += $(LOCAL_DIR)/include

 MODULE_SRCS += \
 	$(LOCAL_DIR)/init.c
--- a/target/beagle/rules.mk
+++ b/target/beagle/rules.mk
@@ -1,7 +1,7 @@
 LOCAL_DIR := $(GET_LOCAL_DIR)

-INCLUDES += \
-	-I$(LOCAL_DIR)/include
+GLOBAL_INCLUDES += \
+	$(LOCAL_DIR)/include

 PLATFORM := omap3

--- a/target/beaglebone/rules.mk
+++ b/target/beaglebone/rules.mk
@@ -2,8 +2,8 @@ LOCAL_DIR := $(GET_LOCAL_DIR)

 #MODULE := $(LOCAL_DIR)

-INCLUDES += \
-	-I$(LOCAL_DIR)/include
+GLOBAL_INCLUDES += \
+	$(LOCAL_DIR)/include

 PLATFORM := am335x

--- a/target/realview-pb/rules.mk
+++ b/target/realview-pb/rules.mk
@@ -2,8 +2,8 @@ LOCAL_DIR := $(GET_LOCAL_DIR)

 #MODULE := $(LOCAL_DIR)

-INCLUDES += \
-	-I$(LOCAL_DIR)/include
+GLOBAL_INCLUDES += \
+	$(LOCAL_DIR)/include

 PLATFORM := realview-pb

--- a/target/sam3x-ek/rules.mk
+++ b/target/sam3x-ek/rules.mk
@@ -5,7 +5,7 @@ MODULE := $(LOCAL_DIR)
 SAM_CHIP := sam3x8h
 PLATFORM := sam3

-INCLUDES += -I$(LOCAL_DIR)/include
+GLOBAL_INCLUDES += $(LOCAL_DIR)/include

 MODULE_SRCS += \
 	$(LOCAL_DIR)/init.c
--- a/target/stellaris-launchpad/rules.mk
+++ b/target/stellaris-launchpad/rules.mk
@@ -8,7 +8,7 @@ PLATFORM := stellaris
 DEFINES += \
 	TARGET_HAS_DEBUG_LED=1

-INCLUDES += -I$(LOCAL_DIR)/include
+GLOBAL_INCLUDES += $(LOCAL_DIR)/include

 MODULE_SRCS += \
 	$(LOCAL_DIR)/init.c
--- a/target/stm32-h103/rules.mk
+++ b/target/stm32-h103/rules.mk
@@ -10,7 +10,7 @@ DEFINES += \
 	ENABLE_UART1=1 \
 	TARGET_HAS_DEBUG_LED=1

-INCLUDES += -I$(LOCAL_DIR)/include
+GLOBAL_INCLUDES += $(LOCAL_DIR)/include

 MODULE_SRCS += \
 	$(LOCAL_DIR)/init.c
--- a/target/stm32-p107/rules.mk
+++ b/target/stm32-p107/rules.mk
@@ -10,7 +10,7 @@ DEFINES += \
 	ENABLE_UART3=1 \
 	TARGET_HAS_DEBUG_LED=1

-INCLUDES += -I$(LOCAL_DIR)/include
+GLOBAL_INCLUDES += $(LOCAL_DIR)/include

 MODULE_SRCS += \
 	$(LOCAL_DIR)/init.c
--- a/target/stm32-p407/rules.mk
+++ b/target/stm32-p407/rules.mk
@@ -10,7 +10,7 @@ DEFINES += \
 	ENABLE_UART3=1 \
 	TARGET_HAS_DEBUG_LED=1

-INCLUDES += -I$(LOCAL_DIR)/include
+GLOBAL_INCLUDES += $(LOCAL_DIR)/include

 MODULE_SRCS += \
 	$(LOCAL_DIR)/init.c
--- a/target/stm3220g/rules.mk
+++ b/target/stm3220g/rules.mk
@@ -10,7 +10,7 @@ DEFINES += \
 	ENABLE_UART3=1 \
 	TARGET_HAS_DEBUG_LED=1

-INCLUDES += -I$(LOCAL_DIR)/include
+GLOBAL_INCLUDES += $(LOCAL_DIR)/include

 MODULE_SRCS += \
 	$(LOCAL_DIR)/init.c