=================================================================== RCS file: /cvs/mandoc/Makefile,v retrieving revision 1.115 retrieving revision 1.177 diff -u -p -r1.115 -r1.177 --- mandoc/Makefile 2009/03/09 14:20:59 1.115 +++ mandoc/Makefile 2009/06/12 12:54:04 1.177 @@ -1,156 +1,72 @@ -.SUFFIXES: .html .sgml +.SUFFIXES: .html .sgml .1.txt .3.txt .7.txt .1 .3 .7 -VERSION = 1.4.7 -VDATE = 9 March 2009 - 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 INSTALL_MAN = $(INSTALL_DATA) -VFLAGS = -DVERSION=\"$(VERSION)\" -CFLAGS += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g +VERSION = 1.7.15 +VDATE = 12 June 2009 +VFLAGS = -DVERSION=\"$(VERSION)\" +CFLAGS += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g LINTFLAGS += $(VFLAGS) CFLAGS += $(VFLAGS) -LIBLNS = macro.ln mdoc.ln hash.ln strings.ln xstd.ln argv.ln \ - validate.ln 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 +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 -TREELNS = mdoctree.ln mmain.ln +MANLNS = man_macro.ln man.ln man_hash.ln man_validate.ln \ + man_action.ln +MANOBJS = man_macro.o man.o man_hash.o man_validate.o \ + man_action.o +MANSRCS = man_macro.c man.c man_hash.c man_validate.c \ + man_action.c -TERMLNS = mdoctree.ln mmain.ln term.ln +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 -LINTLNS = mdoclint.ln mmain.ln +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 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) tags $(TEXTS) ChangeLog +MAKEFILES = Makefile.netbsd Makefile.openbsd Makefile.freebsd \ + Makefile +INSTALL = $(SRCS) $(HEADS) $(MAKEFILES) DESCR $(MANS) $(SGMLS) \ + $(STATICS) $(DATAS) -LNS = $(LIBLNS) $(TREELNS) $(TERMLNS) - -LLNS = llib-llibmdoc.ln llib-lmdoctree.ln llib-lmdocterm.ln - -LIBS = libmdoc.a - -LIBOBJS = macro.o mdoc.o hash.o strings.o xstd.o argv.o \ - validate.o action.o lib.o att.o arch.o vol.o msec.o \ - st.o - -TERMOBJS= mdocterm.o mmain.o term.o - -TREEOBJS= mdoctree.o mmain.o - -LINTOBJS= mdoclint.o mmain.o - -OBJS = $(LIBOBJS) $(TERMOBJS) $(TREEOBJS) $(LINTOBJS) - -SRCS = macro.c mdoc.c hash.c strings.c xstd.c argv.c validate.c \ - action.c term.c mdoctree.c mdocterm.c mmain.c mdoclint.c - -SCRIPTS = strings.sh - -DATAS = arch.in att.in lib.in msec.in st.in vol.in - -GEN = lib.c att.c arch.c vol.c msec.c st.c - -HEADS = mdoc.h private.h term.h mmain.h - -SGMLS = index.sgml - -HTMLS = index.html - -STATICS = style.css external.png - -TARGZS = mdocml-$(VERSION).tar.gz mdocml-oport-$(VERSION).tar.gz \ - mdocml-nport-$(VERSION).tar.gz - -MANS = mdoctree.1 mdocterm.1 mdoclint.1 mdoc.3 - -BINS = mdocterm mdoctree mdoclint - -CLEAN = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) \ - $(TARGZS) $(GEN) - -INSTALL = $(SRCS) $(HEADS) Makefile DESCR $(MANS) $(SGMLS) \ - $(STATICS) $(SCRIPTS) Makefile.netbsd Makefile.openbsd \ - $(DATAS) - -FAIL = regress/test.empty \ - regress/test.prologue.00 \ - regress/test.prologue.01 \ - regress/test.prologue.02 \ - regress/test.prologue.03 \ - regress/test.prologue.04 \ - regress/test.prologue.06 \ - regress/test.prologue.19 \ - regress/test.prologue.23 \ - regress/test.prologue.24 \ - regress/test.prologue.27 \ - regress/test.prologue.28 \ - regress/test.prologue.30 \ - regress/test.prologue.31 \ - regress/test.prologue.32 \ - regress/test.sh.03 \ - regress/test.escape.01 \ - regress/test.escape.02 \ - regress/test.escape.03 \ - regress/test.escape.04 \ - regress/test.escape.06 \ - regress/test.escape.07 \ - regress/test.escape.08 \ - regress/test.escape.09 \ - regress/test.escape.11 \ - regress/test.escape.12 \ - regress/test.escape.14 \ - regress/test.argv.01 \ - regress/test.argv.02 - -SUCCEED = regress/test.prologue.05 \ - regress/test.prologue.07 \ - regress/test.prologue.08 \ - regress/test.prologue.09 \ - regress/test.prologue.10 \ - regress/test.prologue.11 \ - regress/test.prologue.12 \ - regress/test.prologue.13 \ - regress/test.prologue.14 \ - regress/test.prologue.15 \ - regress/test.prologue.16 \ - regress/test.prologue.17 \ - regress/test.prologue.18 \ - regress/test.prologue.20 \ - regress/test.prologue.21 \ - regress/test.prologue.22 \ - regress/test.prologue.25 \ - regress/test.prologue.26 \ - regress/test.prologue.29 \ - regress/test.prologue.33 \ - regress/test.sh.00 \ - regress/test.name.00 \ - regress/test.name.01 \ - regress/test.name.02 \ - regress/test.name.03 \ - regress/test.list.00 \ - regress/test.list.01 \ - regress/test.list.02 \ - regress/test.list.03 \ - regress/test.list.04 \ - regress/test.list.05 \ - regress/test.list.06 \ - regress/test.list.07 \ - regress/test.sh.01 \ - regress/test.sh.02 \ - regress/test.escape.00 \ - regress/test.escape.05 \ - regress/test.escape.10 \ - regress/test.escape.13 \ - regress/test.argv.00 - -REGRESS = $(FAIL) $(SUCCEED) - all: $(BINS) lint: $(LLNS) @@ -163,135 +79,108 @@ cleanlint: dist: mdocml-$(VERSION).tar.gz -port: mdocml-oport-$(VERSION).tar.gz mdocml-nport-$(VERSION).tar.gz +port: mdocml-oport-$(VERSION).tar.gz \ + mdocml-fport-$(VERSION).tar.gz \ + mdocml-nport-$(VERSION).tar.gz -www: $(HTMLS) $(TARGZS) +www: all $(HTMLS) $(TARGZS) $(TEXTS) ChangeLog installwww: www - install -m 0444 $(HTMLS) $(STATICS) $(PREFIX)/ + install -m 0444 $(TEXTS) $(HTMLS) $(STATICS) $(PREFIX)/ + install -m 0444 ChangeLog $(PREFIX)/snapshots/ 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 -regress: mdoclint $(FAIL) $(SUCCEED) - @for f in $(FAIL); do \ - echo "./mdoclint $$f" ; \ - ./mdoclint $$f 2>/dev/null || continue ; exit 1 ; done - @for f in $(SUCCEED); do \ - echo "./mdoclint $$f" ; \ - ./mdoclint $$f 2>/dev/null || exit 1 ; done - install: mkdir -p $(BINDIR) - mkdir -p $(INCLUDEDIR) - mkdir -p $(LIBDIR)/lib mkdir -p $(MANDIR)/man1 - mkdir -p $(MANDIR)/man3 - $(INSTALL_PROGRAM) mdocterm $(BINDIR) - $(INSTALL_PROGRAM) mdoctree $(BINDIR) - $(INSTALL_PROGRAM) mdoclint $(BINDIR) - $(INSTALL_MAN) mdocterm.1 $(MANDIR)/man1 - $(INSTALL_MAN) mdoctree.1 $(MANDIR)/man1 - $(INSTALL_MAN) mdoclint.1 $(MANDIR)/man1 - $(INSTALL_MAN) mdoc.3 $(MANDIR)/man3 - $(INSTALL_LIB) libmdoc.a $(LIBDIR) - $(INSTALL_DATA) mdoc.h $(INCLUDEDIR) + mkdir -p $(MANDIR)/man7 + $(INSTALL_PROGRAM) mandoc $(BINDIR) + $(INSTALL_MAN) mandoc.1 $(MANDIR)/man1 + $(INSTALL_MAN) mdoc.7 $(MANDIR)/man7 uninstall: - rm -f $(BINDIR)/mdocterm - rm -f $(BINDIR)/mdoctree - rm -f $(BINDIR)/mdoclint - rm -f $(MANDIR)/man1/mdocterm.1 - rm -f $(MANDIR)/man1/mdoctree.1 - rm -f $(MANDIR)/man1/mdoclint.1 - rm -f $(MANDIR)/man3/mdoc.3 - rm -f $(LIBDIR)/libmdoc.a - rm -f $(INCLUDEDIR)/mdoc.h + rm -f $(BINDIR)/mandoc + rm -f $(MANDIR)/man1/mandoc.1 + rm -f $(MANDIR)/man7/mdoc.7 -lib.ln: lib.c private.h -lib.o: lib.c private.h +man_macro.ln: man_macro.c libman.h +man_macro.o: man_macro.c libman.h -att.ln: att.c private.h -att.o: att.c private.h +lib.ln: lib.c lib.in libmdoc.h +lib.o: lib.c lib.in libmdoc.h -arch.ln: arch.c private.h -arch.o: arch.c private.h +att.ln: att.c att.in libmdoc.h +att.o: att.c att.in libmdoc.h -vol.ln: vol.c private.h -vol.o: vol.c private.h +arch.ln: arch.c arch.in libmdoc.h +arch.o: arch.c arch.in libmdoc.h -msec.ln: msec.c private.h -msec.o: msec.c private.h +vol.ln: vol.c vol.in libmdoc.h +vol.o: vol.c vol.in libmdoc.h -st.ln: st.c private.h -st.o: st.c private.h +ascii.ln: ascii.c ascii.in term.h +ascii.o: ascii.c ascii.in term.h -lib.c: lib.in strings.sh - sh strings.sh -o $@ lib lib.in +msec.ln: msec.c msec.in libmdoc.h +msec.o: msec.c msec.in libmdoc.h -st.c: st.in strings.sh - sh strings.sh -o $@ st st.in +st.ln: st.c st.in libmdoc.h +st.o: st.c st.in libmdoc.h -msec.c: msec.in strings.sh - sh strings.sh -o $@ msec msec.in +mdoc_macro.ln: mdoc_macro.c libmdoc.h +mdoc_macro.o: mdoc_macro.c libmdoc.h -att.c: att.in strings.sh - sh strings.sh -o $@ att att.in +mdoc_term.ln: mdoc_term.c term.h mdoc.h +mdoc_term.o: mdoc_term.c term.h mdoc.h -arch.c: arch.in strings.sh - sh strings.sh -o $@ arch arch.in +mdoc_strings.ln: mdoc_strings.c libmdoc.h +mdoc_strings.o: mdoc_strings.c libmdoc.h -vol.c: vol.in strings.sh - sh strings.sh -o $@ vol vol.in +man_hash.ln: man_hash.c libman.h +man_hash.o: man_hash.c libman.h -macro.ln: macro.c private.h -macro.o: macro.c private.h +mdoc_hash.ln: mdoc_hash.c libmdoc.h +mdoc_hash.o: mdoc_hash.c libmdoc.h -term.ln: term.c term.h -term.o: term.c term.h +mdoc.ln: mdoc.c libmdoc.h +mdoc.o: mdoc.c libmdoc.h -strings.ln: strings.c private.h -strings.o: strings.c private.h +man.ln: man.c libman.h +man.o: man.c libman.h -hash.ln: hash.c private.h -hash.o: hash.c private.h +main.ln: main.c mdoc.h +main.o: main.c mdoc.h -mdoc.ln: mdoc.c private.h -mdoc.o: mdoc.c private.h +compat.ln: compat.c +compat.o: compat.c -mdocterm.ln: mdocterm.c mmain.h -mdocterm.o: mdocterm.c mmain.h +term.ln: term.c term.h man.h mdoc.h +term.o: term.c term.h man.h mdoc.h -mdoclint.ln: mdoclint.c mmain.h -mdoclint.o: mdoclint.c mmain.h +mdoc_argv.ln: mdoc_argv.c libmdoc.h +mdoc_argv.o: mdoc_argv.c libmdoc.h -mdoctree.ln: mdoctree.c mmain.h -mdoctree.o: mdoctree.c mmain.h +man_validate.ln: man_validate.c libman.h +man_validate.o: man_validate.c libman.h -xstd.ln: xstd.c private.h -xstd.o: xstd.c private.h +mdoc_validate.ln: mdoc_validate.c libmdoc.h +mdoc_validate.o: mdoc_validate.c libmdoc.h -argv.ln: argv.c private.h -argv.o: argv.c private.h +mdoc_action.ln: mdoc_action.c libmdoc.h +mdoc_action.o: mdoc_action.c libmdoc.h -validate.ln: validate.c private.h -validate.o: validate.c private.h +libmdoc.h: mdoc.h -action.ln: action.c private.h -action.o: action.c private.h +ChangeLog: + cvs2cl -P -t --no-indent --FSF --no-times -mmain.ln: mmain.c mmain.h -mmain.o: mmain.c mmain.h - -private.h: mdoc.h - -mmain.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 > \ @@ -301,15 +190,9 @@ mdocml-nport-$(VERSION).tar.gz: mdocml-$(VERSION).tar. sha1 mdocml-$(VERSION).tar.gz >> .dist/mdocml/distinfo install -m 0644 DESCR .dist/mdocml/ echo @comment $$NetBSD$$ > .dist/mdocml/PLIST - echo bin/mdocterm >> .dist/mdocml/PLIST - echo bin/mdoctree >> .dist/mdocml/PLIST - echo bin/mdoclint >> .dist/mdocml/PLIST - echo lib/libmdoc.a >> .dist/mdocml/PLIST - echo include/mdoc.h >> .dist/mdocml/PLIST - echo man/man1/mdoctree.1 >> .dist/mdocml/PLIST - echo man/man1/mdocterm.1 >> .dist/mdocml/PLIST - echo man/man1/mdoclint.1 >> .dist/mdocml/PLIST - echo man/man3/mdoc.3 >> .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/ @@ -321,49 +204,60 @@ mdocml-oport-$(VERSION).tar.gz: mdocml-$(VERSION).tar. 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: Makefile,v 1.115 2009/03/09 14:20:59 kristaps Exp $$ > .dist/mdocml/pkg/PLIST - echo bin/mdocterm >> .dist/mdocml/pkg/PLIST - echo bin/mdoctree >> .dist/mdocml/pkg/PLIST - echo bin/mdoclint >> .dist/mdocml/pkg/PLIST - echo lib/libmdoc.a >> .dist/mdocml/pkg/PLIST - echo include/mdoc.h >> .dist/mdocml/pkg/PLIST - echo @man man/man1/mdoctree.1 >> .dist/mdocml/pkg/PLIST - echo @man man/man1/mdocterm.1 >> .dist/mdocml/pkg/PLIST - echo @man man/man1/mdoclint.1 >> .dist/mdocml/pkg/PLIST - echo @man man/man3/mdoc.3 >> .dist/mdocml/pkg/PLIST + echo @comment $$OpenBSD: Makefile,v 1.177 2009/06/12 12:54:04 kristaps Exp $$ > .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/ +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/ + mdocml-$(VERSION).tar.gz: $(INSTALL) mkdir -p .dist/mdocml/mdocml-$(VERSION)/ - mkdir -p .dist/mdocml/mdocml-$(VERSION)/regress/ install -m 0644 $(INSTALL) .dist/mdocml/mdocml-$(VERSION)/ - install -m 0644 $(REGRESS) .dist/mdocml/mdocml-$(VERSION)/regress/ ( cd .dist/mdocml/ && tar zcf ../../$@ mdocml-$(VERSION)/ ) rm -rf .dist/ -llib-llibmdoc.ln: $(LIBLNS) - $(LINT) $(LINTFLAGS) -Clibmdoc $(LIBLNS) +llib-llibmdoc.ln: $(MDOCLNS) + $(LINT) $(LINTFLAGS) -Clibmdoc $(MDOCLNS) -llib-lmdoctree.ln: $(TREELNS) llib-llibmdoc.ln - $(LINT) $(LINTFLAGS) -Cmdoctree $(TREELNS) llib-llibmdoc.ln +llib-llibman.ln: $(MANLNS) + $(LINT) $(LINTFLAGS) -Clibman $(MANLNS) -llib-lmdocterm.ln: $(TERMLNS) llib-llibmdoc.ln - $(LINT) $(LINTFLAGS) -Cmdocterm $(TERMLNS) llib-llibmdoc.ln +llib-lmandoc.ln: $(MAINLNS) llib-llibmdoc.ln + $(LINT) $(LINTFLAGS) -Cmandoc $(MAINLNS) llib-llibmdoc.ln -libmdoc.a: $(LIBOBJS) - $(AR) rs $@ $(LIBOBJS) +libmdoc.a: $(MDOCOBJS) + $(AR) rs $@ $(MDOCOBJS) -mdocterm: $(TERMOBJS) libmdoc.a - $(CC) $(CFLAGS) -o $@ $(TERMOBJS) libmdoc.a +libman.a: $(MANOBJS) + $(AR) rs $@ $(MANOBJS) -mdoctree: $(TREEOBJS) libmdoc.a - $(CC) $(CFLAGS) -o $@ $(TREEOBJS) libmdoc.a +mandoc: $(MAINOBJS) libmdoc.a libman.a + $(CC) $(CFLAGS) -o $@ $(MAINOBJS) libmdoc.a libman.a -mdoclint: $(LINTOBJS) libmdoc.a - $(CC) $(CFLAGS) -o $@ $(LINTOBJS) libmdoc.a - .sgml.html: validate $< sed -e "s!@VERSION@!$(VERSION)!" -e "s!@VDATE@!$(VDATE)!" $< > $@ +.1.1.txt: + ./mandoc -Wall $< | col -b > $@ + +.3.3.txt: + ./mandoc -Wall $< | col -b > $@ + +.7.7.txt: + ./mandoc -Wall $< | col -b > $@