Author: sjg
Date: Thu Mar 17 04:21:57 2016
New Revision: 296979
URL: https://svnweb.freebsd.org/changeset/base/296979
Log:
xo_config.h no longer in contrib, so -I's needed
PR: /homes/sjg/commit-logs/freebsd/libxo/xo_config.diff
Reviewed by: jkim
Modified:
head/lib/libxo/tests/Makefile
head/usr.bin/xo/Makefile
Modified: head/lib/libxo/tests/Makefile
==============================================================================
--- head/lib/libxo/tests/Makefile Thu Mar 17 03:57:39 2016
(r296978)
+++ head/lib/libxo/tests/Makefile Thu Mar 17 04:21:57 2016
(r296979)
@@ -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>
Modified: head/usr.bin/xo/Makefile
==============================================================================
--- head/usr.bin/xo/Makefile Thu Mar 17 03:57:39 2016 (r296978)
+++ head/usr.bin/xo/Makefile Thu Mar 17 04:21:57 2016 (r296979)
@@ -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
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
