-.SUFFIXES: .html .sgml
+.SUFFIXES: .html .xml .sgml .1.txt .3.txt .7.txt .1 .3 .7 .md5 .tar.gz
BINDIR = $(PREFIX)/bin
INCLUDEDIR = $(PREFIX)/include
INSTALL_LIB = install -m 0644
INSTALL_MAN = $(INSTALL_DATA)
-VERSION = 1.7.1
-VDATE = 23 March 2009
+VERSION = 1.9.2
+VDATE = 05 September 2009
VFLAGS = -DVERSION=\"$(VERSION)\"
CFLAGS += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g
-LINTFLAGS += $(VFLAGS)
CFLAGS += $(VFLAGS)
+LINTFLAGS += $(VFLAGS)
-MDOCLNS = mdoc_macro.ln mdoc.ln mdoc_hash.ln strings.ln xstd.ln \
- argv.ln validate.ln action.ln lib.ln att.ln arch.ln \
- vol.ln msec.ln st.ln
-MDOCOBJS = mdoc_macro.o mdoc.o mdoc_hash.o strings.o xstd.o argv.o \
- validate.o action.o lib.o att.o arch.o vol.o msec.o st.o
-MDOCSRCS = mdoc_macro.c mdoc.c mdoc_hash.c strings.c xstd.c argv.c \
- validate.c action.c lib.c att.c arch.c vol.c msec.c st.c
-
-MANLNS = man_macro.ln man.ln man_hash.ln
-MANOBJS = man_macro.o man.o man_hash.o
-MANSRCS = man_macro.c man.c man_hash.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
+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
+MAINOBJS = main.o mdoc_term.o chars.o term.o tree.o compat.o \
+ man_term.o html.o
+MAINSRCS = main.c mdoc_term.c chars.c term.c tree.c compat.c \
+ man_term.c html.c
LLNS = llib-llibmdoc.ln llib-llibman.ln llib-lmandoc.ln
-LNS = $(MAINLNS) $(MDOCLNS)
+LNS = $(MAINLNS) $(MDOCLNS) $(MANLNS)
LIBS = libmdoc.a libman.a
-OBJS = $(MDOCOBJS) $(MAINOBJS)
-SRCS = $(MDOCSRCS) $(MAINSRCS)
-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
+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
SGMLS = index.sgml
-HTMLS = index.html
+XSLS = ChangeLog.xsl
+HTMLS = index.html ChangeLog.html
+XMLS = ChangeLog.xml
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 manuals.7
+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
+TEXTS = mandoc.1.txt mdoc.3.txt mdoc.7.txt manuals.7.txt \
+ mandoc_char.7.txt man.7.txt man.3.txt
BINS = mandoc
-CLEAN = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) $(TARGZS)
-INSTALL = $(SRCS) $(HEADS) Makefile DESCR $(MANS) $(SGMLS) \
- $(STATICS) Makefile.netbsd Makefile.openbsd $(DATAS)
+CLEAN = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) \
+ $(TARGZS) tags $(TEXTS) $(MD5S) $(XMLS)
+INSTALL = $(SRCS) $(HEADS) Makefile $(MANS) $(SGMLS) $(STATICS) \
+ $(DATAS) $(XSLS)
all: $(BINS)
dist: mdocml-$(VERSION).tar.gz
-port: mdocml-oport-$(VERSION).tar.gz mdocml-nport-$(VERSION).tar.gz
+html: $(HTMLS)
-www: $(HTMLS) $(TARGZS)
+www: all $(HTMLS) $(MD5S) $(TARGZS) $(TEXTS)
installwww: www
- install -m 0444 $(HTMLS) $(STATICS) $(PREFIX)/
+ install -m 0444 $(TEXTS) $(HTMLS) $(STATICS) $(PREFIX)/
install -m 0444 mdocml-$(VERSION).tar.gz $(PREFIX)/snapshots/
+ install -m 0444 mdocml-$(VERSION).md5 $(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-$(VERSION).md5 $(PREFIX)/snapshots/mdocml.md5
install:
mkdir -p $(BINDIR)
vol.ln: vol.c vol.in libmdoc.h
vol.o: vol.c vol.in libmdoc.h
-ascii.ln: ascii.c ascii.in term.h
-ascii.o: ascii.c ascii.in term.h
+chars.ln: chars.c chars.in chars.h
+chars.o: chars.c chars.in chars.h
msec.ln: msec.c msec.in libmdoc.h
msec.o: msec.c msec.in libmdoc.h
mdoc_macro.ln: mdoc_macro.c libmdoc.h
mdoc_macro.o: mdoc_macro.c libmdoc.h
-term.ln: term.c term.h
-term.o: term.c term.h
+mdoc_term.ln: mdoc_term.c term.h mdoc.h
+mdoc_term.o: mdoc_term.c term.h mdoc.h
-strings.ln: strings.c libmdoc.h
-strings.o: strings.c libmdoc.h
+mdoc_strings.ln: mdoc_strings.c libmdoc.h
+mdoc_strings.o: mdoc_strings.c libmdoc.h
man_hash.ln: man_hash.c libman.h
man_hash.o: man_hash.c libman.h
main.ln: main.c mdoc.h
main.o: main.c mdoc.h
-terminal.ln: terminal.c term.h
-terminal.o: terminal.c term.h
+compat.ln: compat.c
+compat.o: compat.c
+
+term.ln: term.c term.h man.h mdoc.h
+term.o: term.c term.h man.h mdoc.h
+
+html.ln: html.c man.h mdoc.h
+html.o: html.c man.h mdoc.h
+
+tree.ln: tree.c man.h mdoc.h
+tree.o: tree.c man.h mdoc.h
-xstd.ln: xstd.c libmdoc.h
-xstd.o: xstd.c libmdoc.h
+mdoc_argv.ln: mdoc_argv.c libmdoc.h
+mdoc_argv.o: mdoc_argv.c libmdoc.h
-argv.ln: argv.c libmdoc.h
-argv.o: argv.c libmdoc.h
+man_argv.ln: man_argv.c libman.h
+man_argv.o: man_argv.c libman.h
-validate.ln: validate.c libmdoc.h
-validate.o: validate.c libmdoc.h
+man_validate.ln: man_validate.c libman.h
+man_validate.o: man_validate.c libman.h
-action.ln: action.c libmdoc.h
-action.o: action.c libmdoc.h
+mdoc_validate.ln: mdoc_validate.c libmdoc.h
+mdoc_validate.o: mdoc_validate.c libmdoc.h
+
+mdoc_action.ln: mdoc_action.c libmdoc.h
+mdoc_action.o: mdoc_action.c libmdoc.h
libmdoc.h: mdoc.h
-term.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.html: ChangeLog.xml ChangeLog.xsl
+ xsltproc -o $@ ChangeLog.xsl ChangeLog.xml
mdocml-$(VERSION).tar.gz: $(INSTALL)
mkdir -p .dist/mdocml/mdocml-$(VERSION)/
- install -m 0644 $(INSTALL) .dist/mdocml/mdocml-$(VERSION)/
+ cp -f $(INSTALL) .dist/mdocml/mdocml-$(VERSION)/
( 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)
- $(LINT) $(LINTFLAGS) -Clibman $(MANLNS)
+ $(LINT) -Clibman $(MANLNS)
llib-lmandoc.ln: $(MAINLNS) llib-llibmdoc.ln
- $(LINT) $(LINTFLAGS) -Cmandoc $(MAINLNS) llib-llibmdoc.ln
+ $(LINT) -Cmandoc $(MAINLNS) llib-llibmdoc.ln
libmdoc.a: $(MDOCOBJS)
$(AR) rs $@ $(MDOCOBJS)
.sgml.html:
validate $<
sed -e "s!@VERSION@!$(VERSION)!" -e "s!@VDATE@!$(VDATE)!" $< > $@
+
+.1.1.txt:
+ ./mandoc -Wall,error -fstrict $< | col -b > $@
+
+.3.3.txt:
+ ./mandoc -Wall,error -fstrict $< | col -b > $@
+
+.7.7.txt:
+ ./mandoc -Wall,error -fstrict $< | col -b > $@
+
+.tar.gz.md5:
+ md5 $< > $@