summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/libxo/tests/Makefile3
-rw-r--r--usr.bin/xo/Makefile5
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/libxo/tests/Makefile b/lib/libxo/tests/Makefile
index 06fb626..e7a069d 100644
--- a/lib/libxo/tests/Makefile
+++ b/lib/libxo/tests/Makefile
@@ -240,7 +240,7 @@ PROGS+= test_09
PROGS+= test_10
PROGS+= test_11
-CFLAGS+= -I${LIBXOSRC}/libxo
+CFLAGS+= -I${LIBXOSRC}/libxo -I${.CURDIR:H}
LIBADD= xo util
@@ -249,7 +249,6 @@ SUBDIR+= encoder
.if ${MACHINE} == "host"
# make it easy to test without install
TESTSDIR= ${.OBJDIR}
-CFLAGS+= -I${.CURDIR:H}
.endif
.include <bsd.test.mk>
diff --git a/usr.bin/xo/Makefile b/usr.bin/xo/Makefile
index 0773987..6159169 100644
--- a/usr.bin/xo/Makefile
+++ b/usr.bin/xo/Makefile
@@ -12,7 +12,10 @@ MAN= xo.1
# XXX For xoversion.h
CFLAGS+=-I${LIBXOSRC}/libxo
-LIBADD= xo
+# XXX For xo_config.h
+CFLAGS+=-I${SRCTOP}/lib/libxo
+
+LIBADD= xo util
.if ${MK_TESTS} != "no"
SUBDIR+= tests
OpenPOWER on IntegriCloud