aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarti Bolivar <mbolivar@leaflabs.com>2011-11-17 15:39:15 -0500
committerMarti Bolivar <mbolivar@leaflabs.com>2012-04-11 16:56:51 -0400
commit748edc3887c714dcc92768556aac7ac563b6247e (patch)
tree22c0fa3074961045adb084d27020f2c3e6489daf
parentbb657c68e77a1c597b45c35978e4c833739144e9 (diff)
downloadlibrambutan-748edc3887c714dcc92768556aac7ac563b6247e.tar.gz
librambutan-748edc3887c714dcc92768556aac7ac563b6247e.zip
libmaple: Add build infrastructure for private headers.
libmaple/rules.mk: Add LIBMAPLE_PRIVATE_INCLUDES, a place for storing headers which should be commonly available throughout libmaple, but not made public. Currently, this is just the libmaple directory. Add LIBMAPLE_PRIVATE_INCLUDES to the target flags in the STM32F1 and USB submodules. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
-rw-r--r--libmaple/rules.mk3
-rw-r--r--libmaple/stm32f1/rules.mk2
-rw-r--r--libmaple/usb/rules.mk2
3 files changed, 4 insertions, 3 deletions
diff --git a/libmaple/rules.mk b/libmaple/rules.mk
index cf95b48..cbff931 100644
--- a/libmaple/rules.mk
+++ b/libmaple/rules.mk
@@ -5,9 +5,10 @@ d := $(dir)
BUILDDIRS += $(BUILD_PATH)/$(d)
LIBMAPLE_INCLUDES := -I$(LIBMAPLE_PATH)/include -I$(LIBMAPLE_MODULE_FAMILY)/include
+LIBMAPLE_PRIVATE_INCLUDES := -I$(LIBMAPLE_PATH)
# Local flags
-CFLAGS_$(d) = -I$(d) $(LIBMAPLE_INCLUDES) -Wall -Werror
+CFLAGS_$(d) = $(LIBMAPLE_PRIVATE_INCLUDES) $(LIBMAPLE_INCLUDES) -Wall -Werror
# Local rules and targets
cSRCS_$(d) := adc.c \
diff --git a/libmaple/stm32f1/rules.mk b/libmaple/stm32f1/rules.mk
index 03d2f95..5267e9b 100644
--- a/libmaple/stm32f1/rules.mk
+++ b/libmaple/stm32f1/rules.mk
@@ -5,7 +5,7 @@ d := $(dir)
BUILDDIRS += $(BUILD_PATH)/$(d)
# Local flags
-CFLAGS_$(d) = -I$(d) $(LIBMAPLE_INCLUDES) -Wall -Werror
+CFLAGS_$(d) = -I$(d) $(LIBMAPLE_PRIVATE_INCLUDES) $(LIBMAPLE_INCLUDES) -Wall -Werror
# Local rules and targets
sSRCS_$(d) := isrs_performance.S \
diff --git a/libmaple/usb/rules.mk b/libmaple/usb/rules.mk
index 9ef8d70..816fad6 100644
--- a/libmaple/usb/rules.mk
+++ b/libmaple/usb/rules.mk
@@ -6,7 +6,7 @@ BUILDDIRS += $(BUILD_PATH)/$(d)
BUILDDIRS += $(BUILD_PATH)/$(d)/usb_lib
# Local flags
-CFLAGS_$(d) = -I$(d) -I$(d)/usb_lib $(LIBMAPLE_INCLUDES) -Wall
+CFLAGS_$(d) = -I$(d) -I$(d)/usb_lib $(LIBMAPLE_INCLUDES) $(LIBMAPLE_PRIVATE_INCLUDES) -Wall
# Local rules and targets
sSRCS_$(d) :=