diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2016-03-17 04:21:57 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2016-03-17 04:21:57 +0000 |
| commit | fb9cfe551bb4c3177637dba09b710914b35562a5 (patch) | |
| tree | 9294a4ac020155b7dda9bdfc0b7bfa36ad73499a | |
| parent | 784a631dc548210d8be6c6f47ac6d80385f03e0b (diff) | |
| download | src-fb9cfe551bb4c3177637dba09b710914b35562a5.tar.gz src-fb9cfe551bb4c3177637dba09b710914b35562a5.zip | |
xo_config.h no longer in contrib, so -I's needed
PR: /homes/sjg/commit-logs/freebsd/libxo/xo_config.diff
Reviewed by: jkim
Notes
Notes:
svn path=/head/; revision=296979
| -rw-r--r-- | lib/libxo/tests/Makefile | 3 | ||||
| -rw-r--r-- | usr.bin/xo/Makefile | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/libxo/tests/Makefile b/lib/libxo/tests/Makefile index 06fb626ce967..e7a069d7adc8 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 0773987d6ab1..6159169a8c8f 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 |