From 038fb97fb799935574a62821fa3eab7ef8ccc14c Mon Sep 17 00:00:00 2001
From: Patrick Williams <iawillia@us.ibm.com>
Date: Mon, 25 Apr 2011 16:47:00 -0500
Subject: Allow additional include paths through EXTRAINCDIRS variable

Change-Id: I7a397e2b340649222eb20f6a478bce022eebbbe5
Reviewed-on: http://gfwr801.rchland.ibm.com:8080/gerrit/39
Tested-by: Jenkins Server
Reviewed-by: Andrew J. Geissler <andrewg@us.ibm.com>
---
 config.mk | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'config.mk')

diff --git a/config.mk b/config.mk
index d9e4e56b2..e24b30e3a 100644
--- a/config.mk
+++ b/config.mk
@@ -7,6 +7,7 @@ IMGDIR = ${ROOTPATH}/img
 EXTRACOMMONFLAGS += -fPIC -Bsymbolic -Bsymbolic-functions
 LIBS += $(addsuffix .so, $(addprefix lib, ${MODULE}))
 MODULE_INIT = ${ROOTPATH}/obj/core/module_init.o
+EXTRAINCDIR += ${ROOTPATH}/src/include/usr
 else
 OBJDIR = ${ROOTPATH}/obj/core
 BEAMDIR = ${ROOTPATH}/obj/beam/core
@@ -43,6 +44,9 @@ CXXFLAGS = ${CFLAGS} -nostdinc++ -fno-rtti -fno-exceptions -Wall
 LDFLAGS = --nostdlib --sort-common ${COMMONFLAGS}
 
 INCDIR = ${ROOTPATH}/src/include/
+_INCDIRS = ${INCDIR} ${EXTRAINCDIR}
+INCFLAGS = $(addprefix -I, ${_INCDIRS} )
+ASMINCFLAGS = $(addprefix $(lastword -Wa,-I), ${_INCDIRS})
 
 OBJECTS = $(addprefix ${OBJDIR}/, ${OBJS})
 LIBRARIES = $(addprefix ${IMGDIR}/, ${LIBS})
@@ -60,36 +64,36 @@ endif
 
 ${OBJDIR}/%.o ${OBJDIR}/%.list : %.C
 	mkdir -p ${OBJDIR}
-	${CXX} -c ${CXXFLAGS} $< -o $@ -I ${INCDIR}
+	${CXX} -c ${CXXFLAGS} $< -o $@ ${INCFLAGS}
 	${OBJDUMP} -dCS $@ > $(basename $@).list	
 
 ${OBJDIR}/%.o ${OBJDIR}/%.list : %.c
 	mkdir -p ${OBJDIR}
-	${CC} -c ${CFLAGS} -std=c99 $< -o $@ -I ${INCDIR}
+	${CC} -c ${CFLAGS} -std=c99 $< -o $@ ${INCFLAGS}
 	${OBJDUMP} -dCS $@ > $(basename $@).list
 
 ${OBJDIR}/%.o : %.S
 	mkdir -p ${OBJDIR}
-	${CC} -c ${ASMFLAGS} $< -o $@ -Wa,-I${INCDIR} -I${INCDIR}
+	${CC} -c ${ASMFLAGS} $< -o $@ ${ASMINCFLAGS} ${INCFLAGS}
 
 ${OBJDIR}/%.dep : %.C
 	mkdir -p ${OBJDIR}; \
 	rm -f $@; \
-	${CXX_RAW} -M ${CXXFLAGS} $< -o $@.$$$$ -I ${INCDIR}; \
+	${CXX_RAW} -M ${CXXFLAGS} $< -o $@.$$$$ ${INCFLAGS}; \
 	sed 's,\($*\)\.o[ :]*,${OBJDIR}/\1.o $@ : ,g' < $@.$$$$ > $@; \
 	rm -f $@.$$$$
 
 ${OBJDIR}/%.dep : %.c
 	mkdir -p ${OBJDIR}; \
 	rm -f $@; \
-	${CC_RAW} -M ${CFLAGS} -std=c99 $< -o $@.$$$$ -I ${INCDIR}; \
+	${CC_RAW} -M ${CFLAGS} -std=c99 $< -o $@.$$$$ ${INCFLAGS}; \
 	sed 's,\($*\)\.o[ :]*,${OBJDIR}/\1.o $@ : ,g' < $@.$$$$ > $@; \
 	rm -f $@.$$$$
 
 ${OBJDIR}/%.dep : %.S
 	mkdir -p ${OBJDIR}; \
 	rm -f $@; \
-	${CC_RAW} -M ${ASMFLAGS} $< -o $@.$$$$ -Wa,-I${INCDIR} -I${INCDIR}; \
+	${CC_RAW} -M ${ASMFLAGS} $< -o $@.$$$$ ${ASMINCFLAGS} ${INCFLAGS}; \
 	sed 's,\($*\)\.o[ :]*,${OBJDIR}/\1.o $@ : ,g' < $@.$$$$ > $@; \
 	rm -f $@.$$$$
 
-- 
cgit v1.2.1