From ebadd13c081a9be8cdbb3c897d4b760e59beb86e Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Mon, 24 Nov 2014 22:12:27 +0000 Subject: [PATCH] Convert mandoc to LIBADD While here remove the ugly LDMANDOC --- share/mk/src.libnames.mk | 3 +-- usr.bin/mandoc/Makefile | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index 7d21c0f23b24..5faa8dbfb753 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -21,7 +21,7 @@ _PRIVATELIBS= \ ucl \ unbound _INTERNALIBS= \ - libmandoc \ + mandoc \ ohash \ readline \ sm @@ -237,7 +237,6 @@ LDSQLITE3?= ${LIBSQLITE3DIR}/libsqlite3.so LIBSQLITE3?= ${LIBSQLITE3DIR}/libsqlite3.a LIBMANDOCDIR= ${ROOTOBJDIR}/lib/libmandoc -LDMANDOC?= ${LIBMANDOCDIR}/libmandoc.a LIBMANDOC?= ${LIBMANDOCDIR}/libmandoc.a LIBSMDIR= ${ROOTOBJDIR}/lib/libsm diff --git a/usr.bin/mandoc/Makefile b/usr.bin/mandoc/Makefile index 481a3f9c5c73..ef3c05ff15f1 100644 --- a/usr.bin/mandoc/Makefile +++ b/usr.bin/mandoc/Makefile @@ -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