aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMarti Bolivar <mbolivar@leaflabs.com>2012-08-31 16:12:14 -0400
committerMarti Bolivar <mbolivar@leaflabs.com>2012-08-31 16:12:14 -0400
commit7ccd7afce2a158eb852b5f7c61cd51e8febe56a9 (patch)
tree79ec4cecad1f07eb99eaa6fcf6977e92a5e3196b /Makefile
parentee22c3dc6d945262303d43e733eaac91bfcf0d9d (diff)
downloadlibrambutan-7ccd7afce2a158eb852b5f7c61cd51e8febe56a9.tar.gz
librambutan-7ccd7afce2a158eb852b5f7c61cd51e8febe56a9.zip
Fixups for Wire library builds.
Add libraries directory to global include path, so Wire sub-headers can be included in a directory-independent way. Tweak Wire global declaration and definition so it builds. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 6a76000..1f19f37 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,7 @@ BUILD_PATH = build
LIBMAPLE_PATH := $(SRCROOT)/libmaple
WIRISH_PATH := $(SRCROOT)/wirish
SUPPORT_PATH := $(SRCROOT)/support
+LIBRARIES_PATH := $(SRCROOT)/libraries
# Support files for linker
LDDIR := $(SUPPORT_PATH)/ld
# Support files for this Makefile
@@ -52,6 +53,7 @@ include $(MAKEDIR)/build-templates.mk
# It slows compilation noticeably; remove after 1 release.
TARGET_FLAGS += -I$(LIBMAPLE_PATH)/include/libmaple \
-I$(WIRISH_PATH)/include/wirish
+TARGET_FLAGS += -I$(LIBRARIES_PATH) # for internal lib. includes, e.g. <Wire/WireBase.h>
GLOBAL_CFLAGS := -Os -g3 -gdwarf-2 -nostdlib \
-ffunction-sections -fdata-sections \
-Wl,--gc-sections $(TARGET_FLAGS)