=================================================================== RCS file: /cvs/mandoc/Makefile,v retrieving revision 1.261 retrieving revision 1.324 diff -u -p -r1.261 -r1.324 --- mandoc/Makefile 2010/04/05 09:19:28 1.261 +++ mandoc/Makefile 2011/03/28 21:49:42 1.324 @@ -1,262 +1,304 @@ -.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 +.PHONY: clean install installwww +.SUFFIXES: .sgml .html .md5 .h .h.html +.SUFFIXES: .1 .3 .7 +.SUFFIXES: .1.txt .3.txt .7.txt +.SUFFIXES: .1.pdf .3.pdf .7.pdf +.SUFFIXES: .1.ps .3.ps .7.ps +.SUFFIXES: .1.html .3.html .7.html +.SUFFIXES: .1.xhtml .3.xhtml .7.xhtml -BINDIR = $(PREFIX)/bin -INCLUDEDIR = $(PREFIX)/include -LIBDIR = $(PREFIX)/lib -MANDIR = $(PREFIX)/man -EXAMPLEDIR = $(PREFIX)/share/examples/mandoc -INSTALL_PROGRAM = install -m 0755 -INSTALL_DATA = install -m 0444 -INSTALL_LIB = install -m 0644 -INSTALL_MAN = $(INSTALL_DATA) - -VERSION = 1.9.22 -VDATE = 31 March 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\"" +# CFLAGS += -DOSNAME="\"OpenBSD 4.5\"" -# Specify this if you want to accept Xo/Xc macros extending the head of -# block full-implicit macros. -# CFLAGS += -DUGLY +VERSION = 1.10.10 +VDATE = 20 March 2011 +CFLAGS += -g -DHAVE_CONFIG_H -DVERSION="\"$(VERSION)\"" +CFLAGS += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings +PREFIX = /usr/local +BINDIR = $(PREFIX)/bin +INCLUDEDIR = $(PREFIX)/include/mandoc +LIBDIR = $(PREFIX)/lib/mandoc +MANDIR = $(PREFIX)/man +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) -LINTFLAGS += $(VFLAGS) +all: mandoc -MANDOCFLAGS = -Wall -fstrict -MANDOCHTML = -Thtml -Ostyle=style.css,man=%N.%S.html,includes=%I.html +SRCS = Makefile \ + arch.c \ + arch.in \ + att.c \ + att.in \ + chars.c \ + chars.in \ + compat.c \ + config.h.post \ + config.h.pre \ + eqn.7 \ + eqn.c \ + example.style.css \ + external.png \ + html.c \ + html.h \ + index.css \ + index.sgml \ + lib.c \ + lib.in \ + libman.h \ + libmandoc.h \ + libmdoc.h \ + libroff.h \ + main.c \ + main.h \ + man.7 \ + man.c \ + man_hash.c \ + man_html.c \ + man_macro.c \ + man_term.c \ + man_validate.c \ + mandoc.1 \ + mandoc.3 \ + mandoc.c \ + mandoc.h \ + mandoc_char.7 \ + mdoc.7 \ + mdoc.c \ + mdoc_argv.c \ + mdoc_hash.c \ + mdoc_html.c \ + mdoc_macro.c \ + mdoc_term.c \ + mdoc_validate.c \ + msec.c \ + msec.in \ + out.c \ + out.h \ + read.c \ + roff.7 \ + roff.c \ + st.c \ + st.in \ + style.css \ + tbl.7 \ + tbl.c \ + tbl_data.c \ + tbl_html.c \ + tbl_layout.c \ + tbl_opts.c \ + tbl_term.c \ + term.c \ + term.h \ + term_ascii.c \ + term_ps.c \ + test-strlcat.c \ + test-strlcpy.c \ + tree.c \ + vol.c \ + vol.in -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 +LIBMAN_OBJS = man.o \ + man_hash.o \ + man_macro.o \ + man_validate.o +LIBMDOC_OBJS = arch.o \ + att.o \ + lib.o \ + mdoc.o \ + mdoc_argv.o \ + mdoc_hash.o \ + mdoc_macro.o \ + mdoc_validate.o \ + msec.o \ + st.o \ + vol.o +LIBROFF_OBJS = eqn.o \ + roff.o \ + tbl.o \ + tbl_data.o \ + tbl_layout.o \ + tbl_opts.o +LIBMANDOC_OBJS = $(LIBMAN_OBJS) \ + $(LIBMDOC_OBJS) \ + $(LIBROFF_OBJS) \ + mandoc.o \ + read.o -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 +arch.o: arch.in +att.o: att.in +lib.o: lib.in +msec.o: msec.in +st.o: st.in +vol.o: vol.in -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 +$(LIBMAN_OBJS): libman.h +$(LIBMDOC_OBJS): libmdoc.h +$(LIBROFF_OBJS): libroff.h +$(LIBMANDOC_OBJS): mandoc.h mdoc.h man.h libmandoc.h config.h -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 main.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 -HTMLS = ChangeLog.html index.html man.h.html mdoc.h.html -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 -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 -BINS = mandoc -TESTS = test-strlcat.c test-strlcpy.c -CONFIGS = config.h.pre config.h.post -CLEAN = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) \ - $(TARGZS) tags $(MD5S) $(XMLS) $(TEXTS) $(GSGMLS) \ - $(GHTMLS) config.h config.log -INSTALL = $(SRCS) $(HEADS) Makefile $(MANS) $(SGMLS) $(STATICS) \ - $(DATAS) $(XSLS) $(EXAMPLES) $(TESTS) $(CONFIGS) +MANDOC_HTML_OBJS = html.o \ + man_html.o \ + mdoc_html.o \ + tbl_html.o +MANDOC_TERM_OBJS = man_term.o \ + mdoc_term.o \ + term.o \ + term_ascii.o \ + term_ps.o \ + tbl_term.o +MANDOC_OBJS = $(MANDOC_HTML_OBJS) \ + $(MANDOC_TERM_OBJS) \ + chars.o \ + main.o \ + out.o \ + tree.o -all: $(BINS) +chars.o: chars.in -lint: $(LLNS) +$(MANDOC_HTML_OBJS): html.h +$(MANDOC_TERM_OBJS): term.h +$(MANDOC_OBJS): main.h mandoc.h mdoc.h man.h config.h out.h -clean: - rm -f $(CLEAN) +compat.o: config.h -cleanlint: - rm -f $(LNS) $(LLNS) +INDEX_MANS = mandoc.1.html \ + mandoc.1.xhtml \ + mandoc.1.ps \ + mandoc.1.pdf \ + mandoc.1.txt \ + mandoc.3.html \ + mandoc.3.xhtml \ + mandoc.3.ps \ + mandoc.3.pdf \ + mandoc.3.txt \ + eqn.7.html \ + eqn.7.xhtml \ + eqn.7.ps \ + eqn.7.pdf \ + eqn.7.txt \ + man.7.html \ + man.7.xhtml \ + man.7.ps \ + man.7.pdf \ + man.7.txt \ + mandoc_char.7.html \ + mandoc_char.7.xhtml \ + mandoc_char.7.ps \ + mandoc_char.7.pdf \ + mandoc_char.7.txt \ + mdoc.7.html \ + mdoc.7.xhtml \ + mdoc.7.ps \ + mdoc.7.pdf \ + mdoc.7.txt \ + roff.7.html \ + roff.7.xhtml \ + roff.7.ps \ + roff.7.pdf \ + roff.7.txt \ + tbl.7.html \ + tbl.7.xhtml \ + tbl.7.ps \ + tbl.7.pdf \ + tbl.7.txt -cleanhtml: - rm -f $(HTMLS) $(GSGMLS) $(GHTMLS) +$(INDEX_MANS): mandoc -dist: mdocml-$(VERSION).tar.gz +INDEX_OBJS = $(INDEX_MANS) \ + man.h.html \ + mandoc.h.html \ + mdoc.h.html \ + mdocml.tar.gz \ + mdocml.md5 -www: all $(GSGMLS) $(GHTMLS) $(HTMLS) $(TEXTS) $(MD5S) $(TARGZS) +www: index.html -htmls: all $(GSGMLS) $(GHTMLS) +clean: + rm -f libmandoc.a $(LIBMANDOC_OBJS) + rm -f mandoc $(MANDOC_OBJS) + rm -f config.h compat.o config.log + rm -f mdocml.tar.gz + rm -f index.html $(INDEX_OBJS) +install: all + mkdir -p $(DESTDIR)$(BINDIR) + mkdir -p $(DESTDIR)$(EXAMPLEDIR) + mkdir -p $(DESTDIR)$(MANDIR)/man1 + mkdir -p $(DESTDIR)$(MANDIR)/man3 + mkdir -p $(DESTDIR)$(MANDIR)/man7 + $(INSTALL_PROGRAM) mandoc $(DESTDIR)$(BINDIR) + $(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR) + $(INSTALL_MAN) mandoc.1 $(DESTDIR)$(MANDIR)/man1 + $(INSTALL_MAN) mandoc.3 $(DESTDIR)$(MANDIR)/man3 + $(INSTALL_MAN) man.7 mdoc.7 roff.7 eqn.7 tbl.7 mandoc_char.7 $(DESTDIR)$(MANDIR)/man7 + $(INSTALL_DATA) example.style.css $(DESTDIR)$(EXAMPLEDIR) + installwww: www - install -m 0444 $(GHTMLS) $(HTMLS) $(TEXTS) $(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-$(VERSION).md5 $(PREFIX)/snapshots/mdocml.md5 + mkdir -p $(PREFIX)/snapshots + $(INSTALL_DATA) index.html external.png index.css $(PREFIX) + $(INSTALL_DATA) $(INDEX_MANS) style.css $(PREFIX) + $(INSTALL_DATA) mandoc.h.html man.h.html mdoc.h.html $(PREFIX) + $(INSTALL_DATA) mdocml.tar.gz $(PREFIX)/snapshots + $(INSTALL_DATA) mdocml.md5 $(PREFIX)/snapshots + $(INSTALL_DATA) mdocml.tar.gz $(PREFIX)/snapshots/mdocml-$(VERSION).tar.gz + $(INSTALL_DATA) mdocml.md5 $(PREFIX)/snapshots/mdocml-$(VERSION).md5 -install: - mkdir -p $(BINDIR) - mkdir -p $(EXAMPLEDIR) - mkdir -p $(MANDIR)/man1 - mkdir -p $(MANDIR)/man7 - $(INSTALL_PROGRAM) mandoc $(BINDIR) - $(INSTALL_MAN) mandoc.1 $(MANDIR)/man1 - $(INSTALL_MAN) man.7 mdoc.7 mandoc_char.7 $(MANDIR)/man7 - $(INSTALL_DATA) example.style.css $(EXAMPLEDIR) +libmandoc.a: compat.o $(LIBMANDOC_OBJS) + $(AR) rs $@ compat.o $(LIBMANDOC_OBJS) -uninstall: - rm -f $(BINDIR)/mandoc - rm -f $(MANDIR)/man1/mandoc.1 - rm -f $(MANDIR)/man7/mdoc.7 - rm -f $(MANDIR)/man7/man.7 - rm -f $(MANDIR)/man7/mandoc_char.7 - rm -f $(EXAMPLEDIR)/example.style.css +mandoc: $(MANDOC_OBJS) libmandoc.a + $(CC) -o $@ $(MANDOC_OBJS) libmandoc.a -$(OBJS): config.h +mdocml.md5: mdocml.tar.gz + md5 mdocml.tar.gz >$@ -$(LNS): config.h +mdocml.tar.gz: $(SRCS) + mkdir -p .dist/mdocml-$(VERSION)/ + $(INSTALL) -m 0444 $(SRCS) .dist/mdocml-$(VERSION) + ( cd .dist/ && tar zcf ../$@ ./ ) + rm -rf .dist/ -man_macro.ln man_macro.o: man_macro.c libman.h +index.html: $(INDEX_OBJS) -lib.ln lib.o: lib.c lib.in libmdoc.h +config.h: config.h.pre config.h.post + rm -f config.log + ( cat config.h.pre; \ + echo; \ + if $(CC) $(CFLAGS) -Werror -o test-strlcat test-strlcat.c >> config.log 2>&1; then \ + echo '#define HAVE_STRLCAT'; \ + rm test-strlcat; \ + fi; \ + if $(CC) $(CFLAGS) -Werror -o test-strlcpy test-strlcpy.c >> config.log 2>&1; then \ + echo '#define HAVE_STRLCPY'; \ + rm test-strlcpy; \ + fi; \ + echo; \ + cat config.h.post \ + ) > $@ -att.ln att.o: att.c att.in libmdoc.h +.h.h.html: + highlight -I $< >$@ -arch.ln arch.o: arch.c arch.in libmdoc.h +.1.1.txt .3.3.txt .7.7.txt: + ./mandoc -Tascii -Wall,stop $< | col -b >$@ -vol.ln vol.o: vol.c vol.in libmdoc.h +.1.1.html .3.3.html .7.7.html: + ./mandoc -Thtml -Wall,stop -Ostyle=style.css,man=%N.%S.html,includes=%I.html $< >$@ -chars.ln chars.o: chars.c chars.in chars.h +.1.1.ps .3.3.ps .7.7.ps: + ./mandoc -Tps -Wall,stop $< >$@ -msec.ln msec.o: msec.c msec.in libmdoc.h +.1.1.xhtml .3.3.xhtml .7.7.xhtml: + ./mandoc -Txhtml -Wall,stop -Ostyle=style.css,man=%N.%S.xhtml,includes=%I.html $< >$@ -st.ln st.o: st.c st.in libmdoc.h +.1.1.pdf .3.3.pdf .7.7.pdf: + ./mandoc -Tpdf -Wall,stop $< >$@ -mdoc_macro.ln mdoc_macro.o: mdoc_macro.c libmdoc.h - -mdoc_term.ln mdoc_term.o: mdoc_term.c term.h mdoc.h - -mdoc_strings.ln mdoc_strings.o: mdoc_strings.c libmdoc.h - -man_hash.ln man_hash.o: man_hash.c libman.h - -mdoc_hash.ln mdoc_hash.o: mdoc_hash.c libmdoc.h - -mdoc.ln mdoc.o: mdoc.c libmdoc.h - -man.ln man.o: man.c libman.h - -main.ln main.o: main.c mdoc.h - -compat.ln compat.o: compat.c - -term.ln term.o: term.c term.h man.h mdoc.h chars.h - -html.ln html.o: html.c html.h chars.h - -mdoc_html.ln mdoc_html.o: mdoc_html.c html.h mdoc.h - -man_html.ln man_html.o: man_html.c html.h man.h out.h - -out.ln out.o: out.c out.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 - -ChangeLog.xml: - cvs2cl --xml --xml-encoding iso-8859-15 -t --noxmlns -f $@ - -ChangeLog.txt: - cvs2cl -t -f $@ - -ChangeLog.html: ChangeLog.xml ChangeLog.xsl - xsltproc -o $@ ChangeLog.xsl ChangeLog.xml - -mdocml-$(VERSION).tar.gz: $(INSTALL) - mkdir -p .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) -Clibmdoc $(MDOCLNS) - -llib-llibman.ln: $(MANLNS) - $(LINT) -Clibman $(MANLNS) - -llib-lmandoc.ln: $(MAINLNS) llib-llibmdoc.ln - $(LINT) -Cmandoc $(MAINLNS) llib-llibmdoc.ln - -libmdoc.a: $(MDOCOBJS) - $(AR) rs $@ $(MDOCOBJS) - -libman.a: $(MANOBJS) - $(AR) rs $@ $(MANOBJS) - -mandoc: $(MAINOBJS) libmdoc.a libman.a - $(CC) $(CFLAGS) -o $@ $(MAINOBJS) libmdoc.a libman.a - .sgml.html: validate --warn $< - 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) $< > $@ - -.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 \ - ) > $@ + sed -e "s!@VERSION@!$(VERSION)!" -e "s!@VDATE@!$(VDATE)!" $< >$@