Drop libmandoc and incorporate it into the main mandoc Makefile

This simplifies maintainance of mandoc(1).
Note that the same direction was taken on OpenBSD

4 files changed, 34 insertions, 52 deletions

diff --git a/lib/Makefile b/lib/Makefile
index d7d7f8a..bee05ab 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -65,7 +65,6 @@ SUBDIR=	${SUBDIR_ORDERED} \
 	${_libldns} \
 	liblzma \
 	${_libmagic} \
-	libmandoc \
 	libmemstat \
 	libmd \
 	${_libmilter} \
diff --git a/lib/libmandoc/Makefile b/lib/libmandoc/Makefile
deleted file mode 100644
index 6529ea4..0000000
--- a/lib/libmandoc/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# $FreeBSD$
-
-MDOCMLDIR=	${.CURDIR}/../../contrib/mdocml
-.PATH: ${MDOCMLDIR}
-
-LIB=	mandoc
-#NO_PIC=
-INTERNALLIB=
-MAN=	mandoc.3 mandoc_headers.3
-LIBMAN_SRCS=	man.c \
-		man_hash.c \
-		man_macro.c \
-		man_validate.c
-
-LIBMDOC_SRCS=	att.c \
-		lib.c \
-		mdoc.c \
-		mdoc_argv.c \
-		mdoc_hash.c \
-		mdoc_macro.c \
-		mdoc_validate.c \
-		st.c
-
-LIBROFF_SRCS=	eqn.c \
-		roff.c \
-		tbl.c \
-		tbl_data.c \
-		tbl_layout.c \
-		tbl_opts.c
-
-SRCS=		${LIBMAN_SRCS} \
-		${LIBMDOC_SRCS} \
-		${LIBROFF_SRCS} \
-		chars.c \
-		mandoc.c \
-		mandoc_aux.c \
-		msec.c \
-		preconv.c \
-		read.c
-
-WARNS?=	3
-CFLAGS+= -DHAVE_CONFIG_H
-
-.include <bsd.lib.mk>
diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk
index 784f680..181bbb4 100644
--- a/share/mk/src.libnames.mk
+++ b/share/mk/src.libnames.mk
@@ -32,7 +32,6 @@ _INTERNALLIBS=	\
 		fifolog \
 		ipf \
 		lpr \
-		mandoc \
 		netbsd \
 		ntp \
 		ntpevent \
@@ -108,7 +107,6 @@ _LIBRARIES=	\
 		lzma \
 		m \
 		magic \
-		mandoc \
 		md \
 		memstat \
 		mp \
@@ -314,9 +312,6 @@ LIBREADLINE?=	${LIBREADLINEDIR}/libreadline.a
 LIBOHASHDIR=	${ROOTOBJDIR}/lib/libohash
 LIBOHASH?=	${LIBOHASHDIR}/libohash.a
 
-LIBMANDOCDIR=	${ROOTOBJDIR}/lib/libmandoc
-LIBMANDOC?=	${LIBMANDOCDIR}/libmandoc.a
-
 LIBSMDIR=	${ROOTOBJDIR}/lib/libsm
 LIBSM?=		${LIBSMDIR}/libsm.a
 
diff --git a/usr.bin/mandoc/Makefile b/usr.bin/mandoc/Makefile
index 5368689..cdb512b 100644
--- a/usr.bin/mandoc/Makefile
+++ b/usr.bin/mandoc/Makefile
@@ -9,6 +9,37 @@ FILESDIR=	${SHAREDIR}/mdocml
 MAN=	mandoc.1 eqn.7 mandoc_char.7 tbl.7 man.7 mdoc.7 # roff.7
 MLINKS= mandoc.1 mdocml.1
 
+LIBMAN_SRCS=	man.c \
+		man_hash.c \
+		man_macro.c \
+		man_validate.c
+
+LIBMDOC_SRCS=	att.c \
+		lib.c \
+		mdoc.c \
+		mdoc_argv.c \
+		mdoc_hash.c \
+		mdoc_macro.c \
+		mdoc_validate.c \
+		st.c \
+
+LIBROFF_SRCS=	eqn.c \
+		roff.c \
+		tbl.c \
+		tbl_data.c \
+		tbl_layout.c \
+		tbl_opts.c \
+
+LIB_SRCS=	${LIBMAN_SRCS} \
+		${LIBMDOC_SRCS} \
+		${LIBROFF_SRCS} \
+		chars.c \
+		mandoc.c \
+		mandoc_aux.c \
+		msec.c \
+		preconv.c \
+		read.c
+
 HTML_SRCS=	eqn_html.c \
 		html.c \
 		man_html.c \
@@ -30,7 +61,8 @@ DB_SRCS=	mandocdb.c \
 		mansearch_const.c \
 		manpath.c
 
-SRCS=		${HTML_SRCS} \
+SRCS=		${LIB_SRCS} \
+		${HTML_SRCS} \
 		${MAN_SRCS} \
 		${TERM_SRCS} \
 		main.c \
@@ -43,6 +75,6 @@ WARNS?=	2
 CFLAGS+= -DHAVE_CONFIG_H \
 	 -I${.CURDIR}/../../lib/libohash/ \
 	 -I${.CURDIR}/../../contrib/sqlite3
-LIBADD=	mandoc ohash sqlite3
+LIBADD=	ohash sqlite3
 
 .include <bsd.prog.mk>