From owner-svn-src-head@freebsd.org  Mon Apr 24 21:31:29 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 46765D4EE14;
 Mon, 24 Apr 2017 21:31:29 +0000 (UTC)
 (envelope-from brooks@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 136A41809;
 Mon, 24 Apr 2017 21:31:28 +0000 (UTC)
 (envelope-from brooks@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3OLVSAR084353;
 Mon, 24 Apr 2017 21:31:28 GMT (envelope-from brooks@FreeBSD.org)
Received: (from brooks@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3OLVS7V084352;
 Mon, 24 Apr 2017 21:31:28 GMT (envelope-from brooks@FreeBSD.org)
Message-Id: <201704242131.v3OLVS7V084352@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: brooks set sender to
 brooks@FreeBSD.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Date: Mon, 24 Apr 2017 21:31:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r317385 - head/usr.bin/getaddrinfo
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Apr 2017 21:31:29 -0000

Author: brooks
Date: Mon Apr 24 21:31:27 2017
New Revision: 317385
URL: https://svnweb.freebsd.org/changeset/base/317385

Log:
  Clean up Makefile.
  
  Prefer SRCTOP vs .CURDIR relative paths.
  
  Find libnetbsd using LIBADD infrastructure rather than manual hackery.
  
  Reviewed by:	ngie, bapt
  Obtained from:	CheriBSD
  MFC after:	1 week
  Sponsored by:	DARPA, AFRL
  Differential Revision:	https://reviews.freebsd.org/D10461

Modified:
  head/usr.bin/getaddrinfo/Makefile

Modified: head/usr.bin/getaddrinfo/Makefile
==============================================================================
--- head/usr.bin/getaddrinfo/Makefile	Mon Apr 24 21:27:37 2017	(r317384)
+++ head/usr.bin/getaddrinfo/Makefile	Mon Apr 24 21:31:27 2017	(r317385)
@@ -3,19 +3,15 @@
 .include <bsd.own.mk>
 
 PROG=	getaddrinfo
+SRCS=	getaddrinfo.c tables.h
 
-CFLAGS+=	-I${.CURDIR}/../../lib/libnetbsd
-LIBNETBSDDIR=	${.OBJDIR}/../../lib/libnetbsd
-LIBNETBSD=	${LIBNETBSDDIR}/libnetbsd.a
-DPADD+=		${LIBNETBSD}
-LDADD+=		${LIBNETBSD}
+CFLAGS+=	-I${SRCTOP}/lib/libnetbsd
 
-LIBADD+=	util
+LIBADD+=	netbsd util
 
-SYS_SOCKET_H?=	${.CURDIR}/../../sys/sys/socket.h
+SYS_SOCKET_H?=	${SRCTOP}/sys/sys/socket.h
 
-CFLAGS+=	-I.
-DPSRCS+=	tables.h
+CFLAGS+=	-I${.OBJDIR}
 CLEANFILES+=	tables.h
 tables.h: tables.awk ${SYS_SOCKET_H}
 	LC_ALL=C awk -f ${.ALLSRC} > ${.TARGET}