Author: bapt
Date: Thu May 21 12:51:56 2015
New Revision: 283220
URL: https://svnweb.freebsd.org/changeset/base/283220
Log:
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
Deleted:
head/lib/libmandoc/
Modified:
head/lib/Makefile
head/share/mk/src.libnames.mk
head/usr.bin/mandoc/Makefile
Modified: head/lib/Makefile
==============================================================================
--- head/lib/Makefile Thu May 21 10:40:18 2015 (r283219)
+++ head/lib/Makefile Thu May 21 12:51:56 2015 (r283220)
@@ -65,7 +65,6 @@ SUBDIR= ${SUBDIR_ORDERED} \
${_libldns} \
liblzma \
${_libmagic} \
- libmandoc \
libmemstat \
libmd \
${_libmilter} \
Modified: head/share/mk/src.libnames.mk
==============================================================================
--- head/share/mk/src.libnames.mk Thu May 21 10:40:18 2015
(r283219)
+++ head/share/mk/src.libnames.mk Thu May 21 12:51:56 2015
(r283220)
@@ -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}/libreadl
LIBOHASHDIR= ${ROOTOBJDIR}/lib/libohash
LIBOHASH?= ${LIBOHASHDIR}/libohash.a
-LIBMANDOCDIR= ${ROOTOBJDIR}/lib/libmandoc
-LIBMANDOC?= ${LIBMANDOCDIR}/libmandoc.a
-
LIBSMDIR= ${ROOTOBJDIR}/lib/libsm
LIBSM?= ${LIBSMDIR}/libsm.a
Modified: head/usr.bin/mandoc/Makefile
==============================================================================
--- head/usr.bin/mandoc/Makefile Thu May 21 10:40:18 2015
(r283219)
+++ head/usr.bin/mandoc/Makefile Thu May 21 12:51:56 2015
(r283220)
@@ -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>
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
