svn commit: r317385 - head/usr.bin/getaddrinfo

[Brooks Davis]

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}