From owner-svn-src-head@freebsd.org  Tue Aug  1 05:34:05 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 A2AEDDAEC45;
 Tue,  1 Aug 2017 05:34:05 +0000 (UTC)
 (envelope-from ngie@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 6FEB364F61;
 Tue,  1 Aug 2017 05:34:05 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v715Y4WU051402;
 Tue, 1 Aug 2017 05:34:04 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v715Y4js051401;
 Tue, 1 Aug 2017 05:34:04 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201708010534.v715Y4js051401@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Tue, 1 Aug 2017 05:34:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r321850 - head/tools/tools/bootparttest
X-SVN-Group: head
X-SVN-Commit-Author: ngie
X-SVN-Commit-Paths: head/tools/tools/bootparttest
X-SVN-Commit-Revision: 321850
X-SVN-Commit-Repository: base
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: Tue, 01 Aug 2017 05:34:05 -0000

Author: ngie
Date: Tue Aug  1 05:34:04 2017
New Revision: 321850
URL: https://svnweb.freebsd.org/changeset/base/321850

Log:
  Makefile cleanup
  
  - Standardize on SRCTOP instead of .CURDIR-relative paths
  - Use LIBADD instead of a mix of specifying -lgeom via DPADD/LDADD/LDFLAGS.
    Specifying -lgeom via LDFLAGS is an especially unnecessary and odd
    pattern.
  
  MFC after:	1 week

Modified:
  head/tools/tools/bootparttest/Makefile

Modified: head/tools/tools/bootparttest/Makefile
==============================================================================
--- head/tools/tools/bootparttest/Makefile	Tue Aug  1 05:29:36 2017	(r321849)
+++ head/tools/tools/bootparttest/Makefile	Tue Aug  1 05:34:04 2017	(r321850)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.PATH:		${.CURDIR}/../../../sys/boot/common
+.PATH:		${SRCTOP}/sys/boot/common
 
 BINDIR?=	/usr/bin
 
@@ -9,12 +9,10 @@ MAN=
 
 SRCS=		bootparttest.c crc32.c stub.c part.c disk.c
 
-CFLAGS=		-I${.CURDIR}/../../../sys/boot/common \
+CFLAGS=		-I${SRCTOP}/sys/boot/common \
 		-DLOADER_GPT_SUPPORT -DLOADER_MBR_SUPPORT -DPART_DEBUG \
 		-DDISK_DEBUG
 
-DPADD+=		${LIBGEOM}
-LDADD+=		${LIBGEOM}
-LDFLAGS+=	-lgeom
+LIBADD+=	geom
 
 .include <bsd.prog.mk>