From owner-svn-src-all@freebsd.org  Thu Mar 17 04:21:59 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1502CAD2516;
 Thu, 17 Mar 2016 04:21:59 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DA483803;
 Thu, 17 Mar 2016 04:21:58 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2H4Lwqf050768;
 Thu, 17 Mar 2016 04:21:58 GMT (envelope-from sjg@FreeBSD.org)
Received: (from sjg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2H4Lv8S050766;
 Thu, 17 Mar 2016 04:21:57 GMT (envelope-from sjg@FreeBSD.org)
Message-Id: <201603170421.u2H4Lv8S050766@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sjg set sender to sjg@FreeBSD.org
 using -f
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Thu, 17 Mar 2016 04:21:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r296979 - in head: lib/libxo/tests usr.bin/xo
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Mar 2016 04:21:59 -0000

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