svn commit: r274989 - in head: share/mk usr.bin/mandoc

Baptiste Daroussin bapt at FreeBSD.org
Mon Nov 24 22:12:28 UTC 2014


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>


More information about the svn-src-head mailing list