From owner-svn-src-all@FreeBSD.ORG  Mon Nov 24 22:12:28 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5A42A5A2;
 Mon, 24 Nov 2014 22:12:28 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 46933B56;
 Mon, 24 Nov 2014 22:12:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAOMCSVr023347;
 Mon, 24 Nov 2014 22:12:28 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAOMCRRK023344;
 Mon, 24 Nov 2014 22:12:27 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201411242212.sAOMCRRK023344@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
 using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 24 Nov 2014 22:12:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r274989 - in head: share/mk usr.bin/mandoc
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.18-1
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: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Nov 2014 22:12:28 -0000

Author: bapt
Date: Mon Nov 24 22:12:27 2014
New Revision: 274989
URL: https://svnweb.freebsd.org/changeset/base/274989

Log:
  Convert mandoc to LIBADD
  
  While here remove the ugly LDMANDOC

Modified:
  head/share/mk/src.libnames.mk
  head/usr.bin/mandoc/Makefile

Modified: head/share/mk/src.libnames.mk
==============================================================================
--- head/share/mk/src.libnames.mk	Mon Nov 24 21:51:43 2014	(r274988)
+++ head/share/mk/src.libnames.mk	Mon Nov 24 22:12:27 2014	(r274989)
@@ -21,7 +21,7 @@ _PRIVATELIBS=	\
 		ucl \
 		unbound
 _INTERNALIBS=	\
-		libmandoc \
+		mandoc \
 		ohash \
 		readline \
 		sm
@@ -237,7 +237,6 @@ LDSQLITE3?=	${LIBSQLITE3DIR}/libsqlite3.
 LIBSQLITE3?=	${LIBSQLITE3DIR}/libsqlite3.a
 
 LIBMANDOCDIR=	${ROOTOBJDIR}/lib/libmandoc
-LDMANDOC?=	${LIBMANDOCDIR}/libmandoc.a
 LIBMANDOC?=	${LIBMANDOCDIR}/libmandoc.a
 
 LIBSMDIR=	${ROOTOBJDIR}/lib/libsm

Modified: head/usr.bin/mandoc/Makefile
==============================================================================
--- head/usr.bin/mandoc/Makefile	Mon Nov 24 21:51:43 2014	(r274988)
+++ head/usr.bin/mandoc/Makefile	Mon Nov 24 22:12:27 2014	(r274989)
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 MDOCMLDIR=	${.CURDIR}/../../contrib/mdocml
-LIBMANDOC=	${.OBJDIR}/../../lib/libmandoc/libmandoc.a
 .PATH: ${MDOCMLDIR}
 
 PROG=	mandoc
@@ -33,7 +32,6 @@ SRCS=		${HTML_SRCS} \
 
 WARNS?=	3
 CFLAGS+= -DHAVE_CONFIG_H
-DPADD=	${LIBMANDOC}
-LDADD=	${LIBMANDOC}
+LIBADD=	mandoc
 
 .include <bsd.prog.mk>