Initial PDF shim over PS. This produces working PDF output with -Tpdf.

[mandoc.git] / Makefile

diff --git a/Makefile b/Makefile
index 44167882c98fc4abeb71dee9c0a150c5129beee6..02cab85a8fb1e2698e1f7800b7157aef509dad1d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,234 +1,283 @@
-.SUFFIXES:     .html .sgml
+.SUFFIXES:     .html .xml .sgml .1 .3 .7 .md5 .tar.gz .1.txt .3.txt .7.txt .1.sgml .3.sgml .7.sgml .h .h.html .1.ps .3.ps .7.ps

 
 

+PREFIX         = /usr/local

 BINDIR         = $(PREFIX)/bin
 INCLUDEDIR     = $(PREFIX)/include
 LIBDIR         = $(PREFIX)/lib
 MANDIR         = $(PREFIX)/man
 BINDIR         = $(PREFIX)/bin
 INCLUDEDIR     = $(PREFIX)/include
 LIBDIR         = $(PREFIX)/lib
 MANDIR         = $(PREFIX)/man

-INSTALL_PROGRAM        = install -m 0755
-INSTALL_DATA   = install -m 0444
-INSTALL_LIB    = install -m 0644
+EXAMPLEDIR     = $(PREFIX)/share/examples/mandoc
+INSTALL                = install
+INSTALL_PROGRAM        = $(INSTALL) -m 0755
+INSTALL_DATA   = $(INSTALL) -m 0444
+INSTALL_LIB    = $(INSTALL) -m 0644

 INSTALL_MAN    = $(INSTALL_DATA)
 
 INSTALL_MAN    = $(INSTALL_DATA)
 

-VERSION           = 1.7.9
-VDATE     = 03 April 2009
+VERSION           = 1.10.4
+VDATE     = 12 July 2010
+
+VFLAGS    = -DVERSION="\"$(VERSION)\""
+WFLAGS     = -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
+CFLAGS    += -g $(WFLAGS) $(VFLAGS) -DHAVE_CONFIG_H
+
+# Specify this if you want to hard-code the operating system to appear
+# in the lower-left hand corner of -mdoc manuals.
+# CFLAGS += -DOSNAME="\"OpenBSD 4.5\""

 
 

-VFLAGS     = -DVERSION=\"$(VERSION)\"
-CFLAGS    += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g

 LINTFLAGS += $(VFLAGS)
 LINTFLAGS += $(VFLAGS)

-CFLAGS    += $(VFLAGS)
+
+MANDOCFLAGS = -Wall -fstrict
+
+MANDOCHTML = -Thtml -Ostyle=style.css,man=%N.%S.html,includes=%I.html
+
+MANDOCPS   = -Tps
+
+ROFFLNS    = roff.ln
+
+ROFFSRCS   = roff.c
+
+ROFFOBJS   = roff.o
+
+MANDOCLNS  = mandoc.ln
+
+MANDOCSRCS = mandoc.c
+
+MANDOCOBJS = mandoc.o

 
 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
 
 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

+

 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
 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

+

 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
 
 MANLNS    = man_macro.ln man.ln man_hash.ln man_validate.ln \
 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
 
 MANLNS    = man_macro.ln man.ln man_hash.ln man_validate.ln \

-            man_action.ln
+            man_action.ln man_argv.ln
+

 MANOBJS           = man_macro.o man.o man_hash.o man_validate.o \
 MANOBJS           = man_macro.o man.o man_hash.o man_validate.o \

-            man_action.o
+            man_action.o man_argv.o

 MANSRCS           = man_macro.c man.c man_hash.c man_validate.c \
 MANSRCS           = man_macro.c man.c man_hash.c man_validate.c \

-            man_action.c
-
-MAINLNS           = main.ln mdoc_term.ln ascii.ln term.ln tree.ln \
-            compat.ln man_term.ln
-MAINOBJS   = main.o mdoc_term.o ascii.o term.o tree.o compat.o \
-            man_term.o
-MAINSRCS   = main.c mdoc_term.c ascii.c term.c tree.c compat.c \
-            man_term.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 ascii.in
-HEADS     = mdoc.h libmdoc.h man.h libman.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-fport-$(VERSION).tar.gz \
-            mdocml-nport-$(VERSION).tar.gz
-MANS      = mandoc.1 mdoc.3 mdoc.7 manuals.7
+            man_action.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 term_ps.ln term_ascii.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 \
+            term_ps.o term_ascii.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 \
+            term_ps.c term_ascii.c
+
+LLNS      = llib-llibmdoc.ln llib-llibman.ln llib-lmandoc.ln \
+            llib-llibmandoc.ln llib-llibroff.ln
+
+LNS       = $(MAINLNS) $(MDOCLNS) $(MANLNS) \
+            $(MANDOCLNS) $(ROFFLNS)
+
+LIBS      = libmdoc.a libman.a libmandoc.a libroff.a
+
+OBJS      = $(MDOCOBJS) $(MAINOBJS) $(MANOBJS) \
+            $(MANDOCOBJS) $(ROFFOBJS)
+
+SRCS      = $(MDOCSRCS) $(MAINSRCS) $(MANSRCS) \
+            $(MANDOCSRCS) $(ROFFSRCS)
+
+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 main.h roff.h \
+            mandoc.h
+
+GSGMLS    = mandoc.1.sgml mdoc.3.sgml mdoc.7.sgml \
+            mandoc_char.7.sgml man.7.sgml man.3.sgml roff.7.sgml \
+            roff.3.sgml
+
+SGMLS     = index.sgml
+
+HTMLS     = ChangeLog.html index.html man.h.html mdoc.h.html \
+            mandoc.h.html roff.h.html mandoc.1.html mdoc.3.html \
+            man.3.html mdoc.7.html man.7.html mandoc_char.7.html \
+            roff.7.html roff.3.html
+
+PSS       = mandoc.1.ps mdoc.3.ps man.3.ps mdoc.7.ps man.7.ps \
+            mandoc_char.7.ps roff.7.ps roff.3.ps
+
+XSLS      = ChangeLog.xsl
+
+TEXTS     = mandoc.1.txt mdoc.3.txt man.3.txt mdoc.7.txt man.7.txt \
+            mandoc_char.7.txt ChangeLog.txt \
+            roff.7.txt roff.3.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 mandoc_char.7 man.7 \
+            man.3 roff.7 roff.3
+

 BINS      = mandoc
 BINS      = mandoc

-CLEAN     = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) $(TARGZS) \
-            tags
-MAKEFILES  = Makefile.netbsd Makefile.openbsd Makefile.freebsd \
-            Makefile
-INSTALL           = $(SRCS) $(HEADS) $(MAKEFILES) DESCR $(MANS) $(SGMLS) \
-            $(STATICS) $(DATAS)
+
+TESTS     = test-strlcat.c test-strlcpy.c
+
+CONFIGS           = config.h.pre config.h.post
+
+DOCLEAN           = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) \
+            $(TARGZS) tags $(MD5S) $(XMLS) $(TEXTS) $(GSGMLS) \
+            config.h config.log $(PSS)
+
+DOINSTALL  = $(SRCS) $(HEADS) Makefile $(MANS) $(SGMLS) $(STATICS) \
+            $(DATAS) $(XSLS) $(EXAMPLES) $(TESTS) $(CONFIGS)

 
 all:   $(BINS)
 
 lint:  $(LLNS)
 
 clean:
 
 all:   $(BINS)
 
 lint:  $(LLNS)
 
 clean:

-       rm -f $(CLEAN)
-
-cleanlint:
-       rm -f $(LNS) $(LLNS)
+       rm -f $(DOCLEAN)

 
 dist:  mdocml-$(VERSION).tar.gz
 
 
 dist:  mdocml-$(VERSION).tar.gz
 

-port:  mdocml-oport-$(VERSION).tar.gz \
-       mdocml-fport-$(VERSION).tar.gz \
-       mdocml-nport-$(VERSION).tar.gz
+www:   all $(GSGMLS) $(HTMLS) $(TEXTS) $(MD5S) $(TARGZS) $(PSS)

 
 

-www:   $(HTMLS) $(TARGZS)
+ps:    $(PSS)

 
 installwww: www
 
 installwww: www

-       install -m 0444 $(HTMLS) $(STATICS) $(PREFIX)/
-       install -m 0444 mdocml-$(VERSION).tar.gz $(PREFIX)/snapshots/
-       install -m 0444 mdocml-$(VERSION).tar.gz $(PREFIX)/snapshots/mdocml.tar.gz
-       install -m 0444 mdocml-oport-$(VERSION).tar.gz $(PREFIX)/ports-openbsd/
-       install -m 0444 mdocml-oport-$(VERSION).tar.gz $(PREFIX)/ports-openbsd/mdocml.tar.gz
-       install -m 0444 mdocml-nport-$(VERSION).tar.gz $(PREFIX)/ports-netbsd/
-       install -m 0444 mdocml-nport-$(VERSION).tar.gz $(PREFIX)/ports-netbsd/mdocml.tar.gz
-       install -m 0444 mdocml-fport-$(VERSION).tar.gz $(PREFIX)/ports-freebsd/
-       install -m 0444 mdocml-fport-$(VERSION).tar.gz $(PREFIX)/ports-freebsd/mdocml.tar.gz
+       $(INSTALL_DATA) $(HTMLS) $(PSS) $(TEXTS) $(STATICS) $(DESTDIR)$(PREFIX)/
+       $(INSTALL_DATA) mdocml-$(VERSION).tar.gz $(DESTDIR)$(PREFIX)/snapshots/
+       $(INSTALL_DATA) mdocml-$(VERSION).md5 $(DESTDIR)$(PREFIX)/snapshots/
+       $(INSTALL_DATA) mdocml-$(VERSION).tar.gz $(DESTDIR)$(PREFIX)/snapshots/mdocml.tar.gz
+       $(INSTALL_DATA) mdocml-$(VERSION).md5 $(DESTDIR)$(PREFIX)/snapshots/mdocml.md5

 
 install:
 
 install:

-       mkdir -p $(BINDIR)
-       mkdir -p $(MANDIR)/man1
-       mkdir -p $(MANDIR)/man7
-       $(INSTALL_PROGRAM) mandoc $(BINDIR)
-       $(INSTALL_MAN) mandoc.1 $(MANDIR)/man1
-       $(INSTALL_MAN) mdoc.7 $(MANDIR)/man7
+       mkdir -p $(DESTDIR)$(BINDIR)
+       mkdir -p $(DESTDIR)$(EXAMPLEDIR)
+       mkdir -p $(DESTDIR)$(MANDIR)/man1
+       mkdir -p $(DESTDIR)$(MANDIR)/man7
+       $(INSTALL_PROGRAM) mandoc $(DESTDIR)$(BINDIR)
+       $(INSTALL_MAN) mandoc.1 $(DESTDIR)$(MANDIR)/man1
+       $(INSTALL_MAN) man.7 mdoc.7 roff.7 mandoc_char.7 $(DESTDIR)$(MANDIR)/man7
+       $(INSTALL_DATA) example.style.css $(DESTDIR)$(EXAMPLEDIR)

 
 uninstall:
 
 uninstall:

-       rm -f $(BINDIR)/mandoc
-       rm -f $(MANDIR)/man1/mandoc.1
-       rm -f $(MANDIR)/man7/mdoc.7
+       rm -f $(DESTDIR)$(BINDIR)/mandoc
+       rm -f $(DESTDIR)$(MANDIR)/man1/mandoc.1
+       rm -f $(DESTDIR)$(MANDIR)/man7/mdoc.7
+       rm -f $(DESTDIR)$(MANDIR)/man7/roff.7
+       rm -f $(DESTDIR)$(MANDIR)/man7/man.7
+       rm -f $(DESTDIR)$(MANDIR)/man7/mandoc_char.7
+       rm -f $(DESTDIR)$(EXAMPLEDIR)/example.style.css
+
+$(OBJS): config.h
+
+$(LNS): config.h
+
+man_macro.ln man_macro.o: man_macro.c libman.h
+
+lib.ln lib.o: lib.c lib.in libmdoc.h
+
+att.ln att.o: att.c att.in libmdoc.h

 
 

-man_macro.ln: man_macro.c libman.h
-man_macro.o: man_macro.c libman.h
+arch.ln arch.o: arch.c arch.in libmdoc.h

 
 

-lib.ln: lib.c lib.in libmdoc.h
-lib.o: lib.c lib.in libmdoc.h
+vol.ln vol.o: vol.c vol.in libmdoc.h

 
 

-att.ln: att.c att.in libmdoc.h
-att.o: att.c att.in libmdoc.h
+chars.ln chars.o: chars.c chars.in chars.h

 
 

-arch.ln: arch.c arch.in libmdoc.h
-arch.o: arch.c arch.in libmdoc.h
+msec.ln msec.o: msec.c msec.in libmdoc.h

 
 

-vol.ln: vol.c vol.in libmdoc.h
-vol.o: vol.c vol.in libmdoc.h
+st.ln st.o: st.c st.in libmdoc.h

 
 

-ascii.ln: ascii.c ascii.in term.h
-ascii.o: ascii.c ascii.in term.h
+mdoc_macro.ln mdoc_macro.o: mdoc_macro.c libmdoc.h

 
 

-msec.ln: msec.c msec.in libmdoc.h
-msec.o: msec.c msec.in libmdoc.h
+mdoc_term.ln mdoc_term.o: mdoc_term.c term.h mdoc.h

 
 

-st.ln: st.c st.in libmdoc.h
-st.o: st.c st.in libmdoc.h
+mdoc_strings.ln mdoc_strings.o: mdoc_strings.c libmdoc.h

 
 

-mdoc_macro.ln: mdoc_macro.c libmdoc.h
-mdoc_macro.o: mdoc_macro.c libmdoc.h
+man_hash.ln man_hash.o: man_hash.c libman.h

 
 

-mdoc_term.ln: mdoc_term.c term.h mdoc.h
-mdoc_term.o: mdoc_term.c term.h mdoc.h
+mdoc_hash.ln mdoc_hash.o: mdoc_hash.c libmdoc.h

 
 

-mdoc_strings.ln: mdoc_strings.c libmdoc.h
-mdoc_strings.o: mdoc_strings.c libmdoc.h
+mdoc.ln mdoc.o: mdoc.c libmdoc.h

 
 

-man_hash.ln: man_hash.c libman.h
-man_hash.o: man_hash.c libman.h
+man.ln man.o: man.c libman.h

 
 

-mdoc_hash.ln: mdoc_hash.c libmdoc.h
-mdoc_hash.o: mdoc_hash.c libmdoc.h
+main.ln main.o: main.c mdoc.h man.h roff.h

 
 

-mdoc.ln: mdoc.c libmdoc.h
-mdoc.o: mdoc.c libmdoc.h
+compat.ln compat.o: compat.c 

 
 

-man.ln: man.c libman.h
-man.o: man.c libman.h
+term.ln term.o: term.c term.h man.h mdoc.h chars.h

 
 

-main.ln: main.c mdoc.h
-main.o: main.c mdoc.h
+term_ps.ln term_ps.o: term_ps.c term.h main.h

 
 

-term.ln: term.c term.h man.h mdoc.h
-term.o: term.c term.h man.h mdoc.h
+term_ascii.ln term_ascii.o: term_ascii.c term.h main.h

 
 

-mdoc_argv.ln: mdoc_argv.c libmdoc.h
-mdoc_argv.o: mdoc_argv.c libmdoc.h
+html.ln html.o: html.c html.h chars.h

 
 

-man_validate.ln: man_validate.c libman.h
-man_validate.o: man_validate.c libman.h
+mdoc_html.ln mdoc_html.o: mdoc_html.c html.h mdoc.h

 
 

-mdoc_validate.ln: mdoc_validate.c libmdoc.h
-mdoc_validate.o: mdoc_validate.c libmdoc.h
+man_html.ln man_html.o: man_html.c html.h man.h out.h

 
 

-mdoc_action.ln: mdoc_action.c libmdoc.h
-mdoc_action.o: mdoc_action.c libmdoc.h
+out.ln out.o: out.c out.h
+
+mandoc.ln mandoc.o: mandoc.c libmandoc.h
+
+tree.ln tree.o: tree.c man.h mdoc.h
+
+mdoc_argv.ln mdoc_argv.o: mdoc_argv.c libmdoc.h
+
+man_argv.ln man_argv.o: man_argv.c libman.h
+
+man_validate.ln man_validate.o: man_validate.c libman.h
+
+mdoc_validate.ln mdoc_validate.o: mdoc_validate.c libmdoc.h
+
+mdoc_action.ln mdoc_action.o: mdoc_action.c libmdoc.h

 
 libmdoc.h: mdoc.h
 
 
 libmdoc.h: mdoc.h
 

-mdocml-nport-$(VERSION).tar.gz: mdocml-$(VERSION).tar.gz Makefile.netbsd DESCR
-       mkdir -p .dist/mdocml/
-       sed -e "s!@VERSION@!$(VERSION)!" Makefile.netbsd > \
-               .dist/mdocml/Makefile
-       md5 mdocml-$(VERSION).tar.gz > .dist/mdocml/distinfo
-       rmd160 mdocml-$(VERSION).tar.gz >> .dist/mdocml/distinfo
-       sha1 mdocml-$(VERSION).tar.gz >> .dist/mdocml/distinfo
-       install -m 0644 DESCR .dist/mdocml/
-       echo @comment $$NetBSD$$ > .dist/mdocml/PLIST
-       echo bin/mandoc >> .dist/mdocml/PLIST
-       echo man/man1/mandoc.1 >> .dist/mdocml/PLIST
-       echo man/man7/mdoc.7 >> .dist/mdocml/PLIST
-       ( cd .dist/ && tar zcf ../$@ mdocml/ )
-       rm -rf .dist/
+ChangeLog.xml:
+       cvs2cl --xml --xml-encoding iso-8859-15 -t --noxmlns -f $@

 
 

-mdocml-oport-$(VERSION).tar.gz: mdocml-$(VERSION).tar.gz Makefile.openbsd DESCR
-       mkdir -p .dist/mdocml/pkg
-       sed -e "s!@VERSION@!$(VERSION)!" Makefile.openbsd > \
-               .dist/mdocml/Makefile
-       md5 mdocml-$(VERSION).tar.gz > .dist/mdocml/distinfo
-       rmd160 mdocml-$(VERSION).tar.gz >> .dist/mdocml/distinfo
-       sha1 mdocml-$(VERSION).tar.gz >> .dist/mdocml/distinfo
-       install -m 0644 DESCR .dist/mdocml/pkg/DESCR
-       echo @comment $$OpenBSD$$ > .dist/mdocml/pkg/PLIST
-       echo bin/mandoc >> .dist/mdocml/pkg/PLIST
-       echo @man man/man1/mandoc.1 >> .dist/mdocml/pkg/PLIST
-       echo @man man/man7/mdoc.7 >> .dist/mdocml/pkg/PLIST
-       ( cd .dist/ && tar zcf ../$@ mdocml/ )
-       rm -rf .dist/
+ChangeLog.txt:
+       cvs2cl -t -f $@

 
 

-mdocml-fport-$(VERSION).tar.gz: mdocml-$(VERSION).tar.gz Makefile.freebsd DESCR
-       mkdir -p .dist/mdocml
-       sed -e "s!@VERSION@!$(VERSION)!" Makefile.freebsd > \
-               .dist/mdocml/Makefile
-       ( md5 mdocml-$(VERSION).tar.gz; \
-         cksum -a SHA256 mdocml-$(VERSION).tar.gz; \
-         echo -n "SIZE (mdocml-$(VERSION).tar.gz) = "; \
-         ls -l mdocml-$(VERSION).tar.gz | awk '{print $$5}' \
-         ) > .dist/mdocml/distinfo
-       install -m 0644 DESCR .dist/mdocml/pkg-descr
-       ( echo; echo "WWW: http://mdocml.bsd.lv/") >> .dist/mdocml/pkg-descr
-       ( cd .dist/ && tar zcf ../$@ mdocml/ )
-       rm -rf .dist/
+ChangeLog.html: ChangeLog.xml ChangeLog.xsl
+       xsltproc -o $@ ChangeLog.xsl ChangeLog.xml

 
 

-mdocml-$(VERSION).tar.gz: $(INSTALL)
+mdocml-$(VERSION).tar.gz: $(DOINSTALL)

        mkdir -p .dist/mdocml/mdocml-$(VERSION)/
        mkdir -p .dist/mdocml/mdocml-$(VERSION)/

-       install -m 0644 $(INSTALL) .dist/mdocml/mdocml-$(VERSION)/
+       cp -f $(DOINSTALL) .dist/mdocml/mdocml-$(VERSION)/

        ( cd .dist/mdocml/ && tar zcf ../../$@ mdocml-$(VERSION)/ )
        rm -rf .dist/
 
 llib-llibmdoc.ln: $(MDOCLNS)
        ( cd .dist/mdocml/ && tar zcf ../../$@ mdocml-$(VERSION)/ )
        rm -rf .dist/
 
 llib-llibmdoc.ln: $(MDOCLNS)

-       $(LINT) $(LINTFLAGS) -Clibmdoc $(MDOCLNS)
+       $(LINT) -Clibmdoc $(MDOCLNS)

 
 llib-llibman.ln: $(MANLNS)
 
 llib-llibman.ln: $(MANLNS)

-       $(LINT) $(LINTFLAGS) -Clibman $(MANLNS)
+       $(LINT) -Clibman $(MANLNS)
+
+llib-llibmandoc.ln: $(MANDOCLNS)
+       $(LINT) -Clibmandoc $(MANDOCLNS)
+
+llib-llibroff.ln: $(ROFFLNS)
+       $(LINT) -Clibroff $(ROFFLNS)

 
 

-llib-lmandoc.ln: $(MAINLNS) llib-llibmdoc.ln
-       $(LINT) $(LINTFLAGS) -Cmandoc $(MAINLNS) llib-llibmdoc.ln
+llib-lmandoc.ln: $(MAINLNS) llib-llibmdoc.ln llib-llibman.ln llib-llibmandoc.ln llib-llibroff.ln
+       $(LINT) -Cmandoc $(MAINLNS) llib-llibmdoc.ln llib-llibman.ln llib-llibmandoc.ln llib-llibroff.ln

 
 libmdoc.a: $(MDOCOBJS)
        $(AR) rs $@ $(MDOCOBJS)
 
 libmdoc.a: $(MDOCOBJS)
        $(AR) rs $@ $(MDOCOBJS)


@@ -236,9 +285,46 @@ libmdoc.a: $(MDOCOBJS)
 libman.a: $(MANOBJS)
        $(AR) rs $@ $(MANOBJS)
 
 libman.a: $(MANOBJS)
        $(AR) rs $@ $(MANOBJS)
 

-mandoc: $(MAINOBJS) libmdoc.a libman.a
-       $(CC) $(CFLAGS) -o $@ $(MAINOBJS) libmdoc.a libman.a
+libmandoc.a: $(MANDOCOBJS)
+       $(AR) rs $@ $(MANDOCOBJS)
+
+libroff.a: $(ROFFOBJS)
+       $(AR) rs $@ $(ROFFOBJS)
+
+mandoc: $(MAINOBJS) libroff.a libmdoc.a libman.a libmandoc.a
+       $(CC) $(CFLAGS) -o $@ $(MAINOBJS) libroff.a libmdoc.a libman.a libmandoc.a

 
 .sgml.html:
 
 .sgml.html:

-       validate $<
+       validate --warn $<

        sed -e "s!@VERSION@!$(VERSION)!" -e "s!@VDATE@!$(VDATE)!" $< > $@
        sed -e "s!@VERSION@!$(VERSION)!" -e "s!@VDATE@!$(VDATE)!" $< > $@

+
+.1.1.txt .3.3.txt .7.7.txt:
+       ./mandoc $(MANDOCFLAGS) $< | col -b > $@
+
+.1.1.sgml .3.3.sgml .7.7.sgml:
+       ./mandoc $(MANDOCFLAGS) $(MANDOCHTML) $< > $@
+
+.1.1.ps .3.3.ps .7.7.ps:
+       ./mandoc $(MANDOCFLAGS) $(MANDOCPS) $< > $@
+
+.tar.gz.md5:
+       md5 $< > $@
+
+.h.h.html:
+       highlight -I $< >$@
+
+config.h: config.h.pre config.h.post
+       rm -f config.log
+       ( cat config.h.pre; \
+       echo; \
+       if $(CC) $(CFLAGS) -Werror -c test-strlcat.c >> config.log 2>&1; then \
+               echo '#define HAVE_STRLCAT'; \
+               rm test-strlcat.o; \
+       fi; \
+       if $(CC) $(CFLAGS) -Werror -c test-strlcpy.c >> config.log 2>&1; then \
+               echo '#define HAVE_STRLCPY'; \
+               rm test-strlcpy.o; \
+       fi; \
+       echo; \
+       cat config.h.post \
+       ) > $@