Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 1 Aug 2017 05:34:04 +0000 (UTC)
From:      Ngie Cooper <ngie@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r321850 - head/tools/tools/bootparttest
Message-ID:  <201708010534.v715Y4js051401@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708010534.v715Y4js051401>