-LIBLNS = macro.ln mdoc.ln hash.ln strings.ln xstd.ln argv.ln \
- validate.ln action.ln lib.ln att.ln arch.ln vol.ln \
- msec.ln st.ln
-LIBOBJS = macro.o mdoc.o hash.o strings.o xstd.o argv.o validate.o \
- action.o lib.o att.o arch.o vol.o msec.o st.o
-LIBSRCS = macro.c mdoc.c hash.c strings.c xstd.c argv.c validate.c \
- action.c lib.c att.c arch.c vol.c msec.c st.c
-
-MAINLNS = main.ln term.ln ascii.ln terminal.ln tree.ln compat.ln
-MAINOBJS = main.o term.o ascii.o terminal.o tree.o compat.o
-MAINSRCS = main.c term.c ascii.c terminal.c tree.c compat.c
-
-LLNS = llib-llibmdoc.ln llib-lmandoc.ln
-LNS = $(MAINLNS) $(LIBLNS)
-LIBS = libmdoc.a
-OBJS = $(LIBOBJS) $(MAINOBJS)
-SRCS = $(LIBSRCS) $(MAINSRCS)
-DATAS = arch.in att.in lib.in msec.in st.in vol.in ascii.in
-HEADS = mdoc.h private.h term.h
-SGMLS = index.sgml
-HTMLS = index.html
-STATICS = style.css external.png
-TARGZS = mdocml-$(VERSION).tar.gz \
- mdocml-oport-$(VERSION).tar.gz \
- mdocml-nport-$(VERSION).tar.gz
-MANS = mandoc.1 mdoc.3 mdoc.7
+MANDOCFLAGS = -Wall -fstrict
+MANDOCHTML = -Thtml -ostyle=style.css,man=%N.%S.html,includes=%I.html
+
+MDOCLNS = mdoc_macro.ln mdoc.ln mdoc_hash.ln mdoc_strings.ln \
+ mdoc_argv.ln mdoc_validate.ln mdoc_action.ln \
+ lib.ln att.ln arch.ln vol.ln msec.ln st.ln \
+ mandoc.ln
+MDOCOBJS = mdoc_macro.o mdoc.o mdoc_hash.o mdoc_strings.o \
+ mdoc_argv.o mdoc_validate.o mdoc_action.o lib.o att.o \
+ arch.o vol.o msec.o st.o mandoc.o
+MDOCSRCS = mdoc_macro.c mdoc.c mdoc_hash.c mdoc_strings.c \
+ mdoc_argv.c mdoc_validate.c mdoc_action.c lib.c att.c \
+ arch.c vol.c msec.c st.c mandoc.c
+
+MANLNS = man_macro.ln man.ln man_hash.ln man_validate.ln \
+ man_action.ln mandoc.ln man_argv.ln
+MANOBJS = man_macro.o man.o man_hash.o man_validate.o \
+ man_action.o mandoc.o man_argv.o
+MANSRCS = man_macro.c man.c man_hash.c man_validate.c \
+ man_action.c mandoc.c man_argv.c
+
+MAINLNS = main.ln mdoc_term.ln chars.ln term.ln tree.ln \
+ compat.ln man_term.ln html.ln mdoc_html.ln \
+ man_html.ln out.ln
+MAINOBJS = main.o mdoc_term.o chars.o term.o tree.o compat.o \
+ man_term.o html.o mdoc_html.o man_html.o out.o
+MAINSRCS = main.c mdoc_term.c chars.c term.c tree.c compat.c \
+ man_term.c html.c mdoc_html.c man_html.c out.c
+
+LLNS = llib-llibmdoc.ln llib-llibman.ln llib-lmandoc.ln
+LNS = $(MAINLNS) $(MDOCLNS) $(MANLNS)
+LIBS = libmdoc.a libman.a
+OBJS = $(MDOCOBJS) $(MAINOBJS) $(MANOBJS)
+SRCS = $(MDOCSRCS) $(MAINSRCS) $(MANSRCS)
+DATAS = arch.in att.in lib.in msec.in st.in \
+ vol.in chars.in
+HEADS = mdoc.h libmdoc.h man.h libman.h term.h \
+ libmandoc.h html.h chars.h out.h
+GSGMLS = mandoc.1.sgml mdoc.3.sgml mdoc.7.sgml manuals.7.sgml \
+ mandoc_char.7.sgml man.7.sgml man.3.sgml
+SGMLS = index.sgml $(GSGMLS)
+XSLS = ChangeLog.xsl
+HTMLS = index.html mandoc.1.html mdoc.3.html \
+ man.3.html mdoc.7.html man.7.html mandoc_char.7.html \
+ manuals.7.html
+TEXTS = mandoc.1.txt mdoc.3.txt man.3.txt mdoc.7.txt man.7.txt \
+ mandoc_char.7.txt manuals.7.txt ChangeLog.txt
+EXAMPLES = example.style.css
+XMLS = ChangeLog.xml
+STATICS = index.css style.css external.png
+MD5S = mdocml-$(VERSION).md5
+TARGZS = mdocml-$(VERSION).tar.gz
+MANS = mandoc.1 mdoc.3 mdoc.7 manuals.7 mandoc_char.7 \
+ man.7 man.3