summaryrefslogtreecommitdiffstats
path: root/usr.bin/mandoc
diff options
context:
space:
mode:
authorsjg <sjg@FreeBSD.org>2015-05-27 01:19:58 +0000
committersjg <sjg@FreeBSD.org>2015-05-27 01:19:58 +0000
commit65145fa4c81da358fcbc3b650156dab705dfa34e (patch)
tree55c065b6730aaac2afb6c29933ee6ec5fa4c4249 /usr.bin/mandoc
parent60ff4eb0dff94a04d75d0d52a3957aaaf5f8c693 (diff)
parente6b664c390af88d4a87208bc042ce503da664c3b (diff)
downloadFreeBSD-src-65145fa4c81da358fcbc3b650156dab705dfa34e.zip
FreeBSD-src-65145fa4c81da358fcbc3b650156dab705dfa34e.tar.gz
Merge sync of head
Diffstat (limited to 'usr.bin/mandoc')
-rw-r--r--usr.bin/mandoc/Makefile82
-rw-r--r--usr.bin/mandoc/Makefile.depend4
2 files changed, 73 insertions, 13 deletions
diff --git a/usr.bin/mandoc/Makefile b/usr.bin/mandoc/Makefile
index ed88f4e..cdb512b 100644
--- a/usr.bin/mandoc/Makefile
+++ b/usr.bin/mandoc/Makefile
@@ -1,22 +1,80 @@
# $FreeBSD$
MDOCMLDIR= ${.CURDIR}/../../contrib/mdocml
-LIBMANDOC= ${.OBJDIR}/../../lib/libmandoc/libmandoc.a
.PATH: ${MDOCMLDIR}
PROG= mandoc
-FILES= example.style.css external.png style.css
+FILES= example.style.css style.css
FILESDIR= ${SHAREDIR}/mdocml
-LINKS= mdocml
-MAN= mandoc.1 eqn.7 mandoc_char.7 tbl.7 # man.7 mdoc.7 roff.7
+MAN= mandoc.1 eqn.7 mandoc_char.7 tbl.7 man.7 mdoc.7 # roff.7
MLINKS= mandoc.1 mdocml.1
-SRCS= eqn_html.c eqn_term.c html.c main.c man_html.c man_term.c mdoc_html.c \
- mdoc_man.c mdoc_term.c out.c tbl_html.c tbl_term.c term.c \
- term_ascii.c term_ps.c tree.c
-
-WARNS?= 3
-CFLAGS+= -DHAVE_CONFIG_H
-DPADD= ${LIBMANDOC}
-LDADD= ${LIBMANDOC}
+
+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 \
+ mdoc_html.c \
+ tbl_html.c
+
+MAN_SRCS= mdoc_man.c
+
+TERM_SRCS= eqn_term.c \
+ man_term.c \
+ mdoc_term.c \
+ term.c \
+ term_ascii.c \
+ term_ps.c \
+ tbl_term.c
+
+DB_SRCS= mandocdb.c \
+ mansearch.c \
+ mansearch_const.c \
+ manpath.c
+
+SRCS= ${LIB_SRCS} \
+ ${HTML_SRCS} \
+ ${MAN_SRCS} \
+ ${TERM_SRCS} \
+ main.c \
+ out.c \
+ tree.c
+
+SRCS+= ${DB_SRCS}
+
+WARNS?= 2
+CFLAGS+= -DHAVE_CONFIG_H \
+ -I${.CURDIR}/../../lib/libohash/ \
+ -I${.CURDIR}/../../contrib/sqlite3
+LIBADD= ohash sqlite3
.include <bsd.prog.mk>
diff --git a/usr.bin/mandoc/Makefile.depend b/usr.bin/mandoc/Makefile.depend
index 456ca6f..1a4115b 100644
--- a/usr.bin/mandoc/Makefile.depend
+++ b/usr.bin/mandoc/Makefile.depend
@@ -10,7 +10,9 @@ DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libmandoc \
+ lib/libohash \
+ lib/libsqlite3 \
+ lib/libthr \
.include <dirdeps.mk>
OpenPOWER on IntegriCloud