=================================================================== RCS file: /cvs/mandoc/Makefile,v retrieving revision 1.276 retrieving revision 1.285 diff -u -p -r1.276 -r1.285 --- mandoc/Makefile 2010/06/07 12:20:07 1.276 +++ mandoc/Makefile 2010/07/05 20:00:55 1.285 @@ -1,4 +1,4 @@ -.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 +.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 @@ -12,8 +12,8 @@ INSTALL_DATA = $(INSTALL) -m 0444 INSTALL_LIB = $(INSTALL) -m 0644 INSTALL_MAN = $(INSTALL_DATA) -VERSION = 1.10.1 -VDATE = 07 June 2010 +VERSION = 1.10.3 +VDATE = 29 June 2010 VFLAGS = -DVERSION="\"$(VERSION)\"" WFLAGS = -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings @@ -23,27 +23,25 @@ CFLAGS += -g $(WFLAGS) $(VFLAGS) -DHAVE_CONFIG_H # in the lower-left hand corner of -mdoc manuals. # CFLAGS += -DOSNAME="\"OpenBSD 4.5\"" -# Unset this if you don't want Xo/Xc allowing split `It' lines, which -# breaks symmetry. -CFLAGS += -DUGLY - LINTFLAGS += $(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 +MANDOCLNS = libmandoc.ln -MANDOCSRCS = mandoc.c +MANDOCSRCS = libmandoc.c -MANDOCOBJS = mandoc.o +MANDOCOBJS = libmandoc.o MDOCLNS = mdoc_macro.ln mdoc.ln mdoc_hash.ln mdoc_strings.ln \ mdoc_argv.ln mdoc_validate.ln mdoc_action.ln \ @@ -63,17 +61,19 @@ MANLNS = man_macro.ln man.ln man_hash.ln man_valida MANOBJS = man_macro.o man.o man_hash.o man_validate.o \ man_action.o man_argv.o MANSRCS = man_macro.c man.c man_hash.c man_validate.c \ - man_action.c mandoc.c man_argv.c + man_action.c libmandoc.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 + 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 + 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 + 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 @@ -94,7 +94,7 @@ DATAS = arch.in att.in lib.in msec.in st.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 + mandoc.h regs.h GSGMLS = mandoc.1.sgml mdoc.3.sgml mdoc.7.sgml \ mandoc_char.7.sgml man.7.sgml man.3.sgml roff.7.sgml \ @@ -107,6 +107,9 @@ HTMLS = ChangeLog.html index.html man.h.html mdoc.h 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 \ @@ -134,7 +137,7 @@ CONFIGS = config.h.pre config.h.post DOCLEAN = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) \ $(TARGZS) tags $(MD5S) $(XMLS) $(TEXTS) $(GSGMLS) \ - config.h config.log + config.h config.log $(PSS) DOINSTALL = $(SRCS) $(HEADS) Makefile $(MANS) $(SGMLS) $(STATICS) \ $(DATAS) $(XSLS) $(EXAMPLES) $(TESTS) $(CONFIGS) @@ -146,18 +149,14 @@ lint: $(LLNS) clean: rm -f $(DOCLEAN) -cleanlint: - rm -f $(LNS) $(LLNS) - -cleanhtml: - rm -f $(HTMLS) $(GSGMLS) - dist: mdocml-$(VERSION).tar.gz -www: all $(GSGMLS) $(HTMLS) $(TEXTS) $(MD5S) $(TARGZS) +www: all $(GSGMLS) $(HTMLS) $(TEXTS) $(MD5S) $(TARGZS) $(PSS) +ps: $(PSS) + installwww: www - $(INSTALL_DATA) $(HTMLS) $(TEXTS) $(STATICS) $(DESTDIR)$(PREFIX)/ + $(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 @@ -222,6 +221,10 @@ compat.ln compat.o: compat.c term.ln term.o: term.c term.h man.h mdoc.h chars.h +term_ps.ln term_ps.o: term_ps.c term.h main.h + +term_ascii.ln term_ascii.o: term_ascii.c term.h main.h + html.ln html.o: html.c html.h chars.h mdoc_html.ln mdoc_html.o: mdoc_html.c html.h mdoc.h @@ -230,7 +233,7 @@ man_html.ln man_html.o: man_html.c html.h man.h out.h out.ln out.o: out.c out.h -mandoc.ln mandoc.o: mandoc.c libmandoc.h +libmandoc.ln libmandoc.o: libmandoc.c libmandoc.h tree.ln tree.o: tree.c man.h mdoc.h @@ -300,6 +303,9 @@ mandoc: $(MAINOBJS) libroff.a libmdoc.a libman.a libma .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 $< > $@