=================================================================== RCS file: /cvs/mandoc/Makefile,v retrieving revision 1.270 retrieving revision 1.279 diff -u -p -r1.270 -r1.279 --- mandoc/Makefile 2010/05/17 02:19:44 1.270 +++ mandoc/Makefile 2010/06/08 15:00:17 1.279 @@ -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.9.25 -VDATE = 13 May 2010 +VERSION = 1.10.1 +VDATE = 07 June 2010 VFLAGS = -DVERSION="\"$(VERSION)\"" WFLAGS = -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings @@ -33,6 +33,8 @@ MANDOCFLAGS = -Wall -fstrict MANDOCHTML = -Thtml -Ostyle=style.css,man=%N.%S.html,includes=%I.html +MANDOCPS = -Tps + ROFFLNS = roff.ln ROFFSRCS = roff.c @@ -67,13 +69,15 @@ MANSRCS = man_macro.c man.c man_hash.c man_validate 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 @@ -93,22 +97,28 @@ 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 + libmandoc.h html.h chars.h out.h main.h roff.h \ + mandoc.h -GSGMLS = mandoc.1.sgml mdoc.3.sgml mdoc.7.sgml manuals.7.sgml \ - mandoc_char.7.sgml man.7.sgml man.3.sgml +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 +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 -GHTMLS = 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 + mandoc_char.7.txt ChangeLog.txt \ + roff.7.txt roff.3.txt EXAMPLES = example.style.css @@ -120,8 +130,8 @@ 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 +MANS = mandoc.1 mdoc.3 mdoc.7 mandoc_char.7 man.7 \ + man.3 roff.7 roff.3 BINS = mandoc @@ -131,7 +141,7 @@ CONFIGS = config.h.pre config.h.post DOCLEAN = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) \ $(TARGZS) tags $(MD5S) $(XMLS) $(TEXTS) $(GSGMLS) \ - $(GHTMLS) config.h config.log + config.h config.log $(PSS) DOINSTALL = $(SRCS) $(HEADS) Makefile $(MANS) $(SGMLS) $(STATICS) \ $(DATAS) $(XSLS) $(EXAMPLES) $(TESTS) $(CONFIGS) @@ -143,20 +153,14 @@ lint: $(LLNS) clean: rm -f $(DOCLEAN) -cleanlint: - rm -f $(LNS) $(LLNS) - -cleanhtml: - rm -f $(HTMLS) $(GSGMLS) $(GHTMLS) - dist: mdocml-$(VERSION).tar.gz -www: all $(GSGMLS) $(GHTMLS) $(HTMLS) $(TEXTS) $(MD5S) $(TARGZS) +www: all $(GSGMLS) $(HTMLS) $(TEXTS) $(MD5S) $(TARGZS) $(PSS) -htmls: all $(GSGMLS) $(GHTMLS) +ps: $(PSS) installwww: www - $(INSTALL_DATA) $(GHTMLS) $(HTMLS) $(TEXTS) $(STATICS) $(DESTDIR)$(PREFIX)/ + $(INSTALL_DATA) $(HTMLS) $(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 @@ -169,13 +173,14 @@ install: mkdir -p $(DESTDIR)$(MANDIR)/man7 $(INSTALL_PROGRAM) mandoc $(DESTDIR)$(BINDIR) $(INSTALL_MAN) mandoc.1 $(DESTDIR)$(MANDIR)/man1 - $(INSTALL_MAN) man.7 mdoc.7 mandoc_char.7 $(DESTDIR)$(MANDIR)/man7 + $(INSTALL_MAN) man.7 mdoc.7 roff.7 mandoc_char.7 $(DESTDIR)$(MANDIR)/man7 $(INSTALL_DATA) example.style.css $(DESTDIR)$(EXAMPLEDIR) uninstall: 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 @@ -220,6 +225,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 @@ -298,6 +307,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 $< > $@