Prioritize local includes and libraries

This fixes #35.
2015-01-22 09:43:28 -05:00
parent 8250ac94df
commit 3f80f22e22
6 changed files with 11 additions and 11 deletions
--- a/src/libeinfo/Makefile
+++ b/src/libeinfo/Makefile
@@ -4,7 +4,7 @@ SRCS=			libeinfo.c
 INCS=			einfo.h
 VERSION_MAP=		einfo.map

-CPPFLAGS+=		-I../includes
+LOCAL_CPPFLAGS+=		-I../includes

 MK=			../../mk
 include ${MK}/lib.mk
--- a/src/librc/Makefile
+++ b/src/librc/Makefile
@@ -7,7 +7,7 @@ VERSION_MAP=	rc.map

 LDADD+=		${LIBKVM}

-CPPFLAGS+=	-I../includes
+LOCAL_CPPFLAGS+=	-I../includes

 MK=		../../mk
 include ${MK}/lib.mk
--- a/src/rc/Makefile
+++ b/src/rc/Makefile
@@ -35,8 +35,8 @@ RC_SBINLINKS=	mark_service_starting mark_service_started \
 ALL_LINKS=	${BINLINKS} ${SBINLINKS} ${RC_BINLINKS} ${RC_SBINLINKS}
 CLEANFILES+=	${ALL_LINKS}

-CPPFLAGS+=	-I../includes -I../librc -I../libeinfo
-LDFLAGS+=	-L../librc -L../libeinfo
+LOCAL_CPPFLAGS=-I../includes -I../librc -I../libeinfo
+LOCAL_LDFLAGS=-L../librc -L../libeinfo
 LDADD+=		-lutil -lrc -leinfo

 include ../../Makefile.inc