=================================================================== RCS file: /cvs/mandoc/Makefile,v retrieving revision 1.105 retrieving revision 1.130 diff -u -p -r1.105 -r1.130 --- mandoc/Makefile 2009/03/04 14:41:40 1.105 +++ mandoc/Makefile 2009/03/17 09:33:02 1.130 @@ -1,7 +1,7 @@ .SUFFIXES: .html .sgml -VERSION = 1.3.18 -VDATE = 04 March 2009 +VERSION = 1.5.3 +VDATE = 17 March 2009 BINDIR = $(PREFIX)/bin INCLUDEDIR = $(PREFIX)/include @@ -13,14 +13,19 @@ 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 +LINTFLAGS += $(VFLAGS) +CFLAGS += $(VFLAGS) + LIBLNS = macro.ln mdoc.ln hash.ln strings.ln xstd.ln argv.ln \ - validate.ln action.ln + validate.ln action.ln lib.ln att.ln arch.ln vol.ln \ + msec.ln st.ln TREELNS = mdoctree.ln mmain.ln -TERMLNS = mdoctree.ln mmain.ln term.ln +TERMLNS = mdoctree.ln mmain.ln term.ln ascii.ln LINTLNS = mdoclint.ln mmain.ln @@ -31,19 +36,23 @@ LLNS = llib-llibmdoc.ln llib-lmdoctree.ln llib-lmdocte LIBS = libmdoc.a LIBOBJS = macro.o mdoc.o hash.o strings.o xstd.o argv.o \ - validate.o action.o + validate.o action.o lib.o att.o arch.o vol.o msec.o \ + st.o -TERMOBJS= mdocterm.o mmain.o term.o +TERMOBJS= mdocterm.o mmain.o term.o ascii.o TREEOBJS= mdoctree.o mmain.o LINTOBJS= mdoclint.o mmain.o -OBJS = $(LIBOBJS) $(TERMOBJS) $(TREEOBJS) +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 + action.c term.c mdoctree.c mdocterm.c mmain.c mdoclint.c \ + lib.c att.c arch.c vol.c msec.c st.c ascii.c +DATAS = arch.in att.in lib.in msec.in st.in vol.in ascii.in + HEADS = mdoc.h private.h term.h mmain.h SGMLS = index.sgml @@ -55,86 +64,16 @@ 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 +MANS = mdoctree.1 mdocterm.1 mdoclint.1 mdoc.3 mdoc.7 BINS = mdocterm mdoctree mdoclint CLEAN = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) \ - $(TARGZS) + $(TARGZS) INSTALL = $(SRCS) $(HEADS) Makefile DESCR $(MANS) $(SGMLS) \ - $(STATICS) Makefile.netbsd Makefile.openbsd + $(STATICS) 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.13 \ - regress/test.prologue.15 \ - regress/test.prologue.16 \ - regress/test.prologue.18 \ - regress/test.prologue.19 \ - regress/test.prologue.21 \ - regress/test.prologue.22 \ - regress/test.prologue.23 \ - regress/test.prologue.24 \ - regress/test.prologue.25 \ - regress/test.prologue.26 \ - regress/test.prologue.27 \ - regress/test.prologue.28 \ - regress/test.prologue.29 \ - regress/test.prologue.30 \ - regress/test.prologue.31 \ - regress/test.prologue.32 \ - regress/test.prologue.33 \ - 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 - -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.14 \ - regress/test.prologue.17 \ - regress/test.prologue.20 \ - 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 = $(FAIL) $(SUCCEED) - all: $(BINS) lint: $(LLNS) @@ -160,14 +99,6 @@ installwww: www 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 -regress: mdoclint - @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) @@ -195,6 +126,27 @@ uninstall: rm -f $(LIBDIR)/libmdoc.a rm -f $(INCLUDEDIR)/mdoc.h +lib.ln: lib.c lib.in private.h +lib.o: lib.c lib.in private.h + +att.ln: att.c att.in private.h +att.o: att.c att.in private.h + +arch.ln: arch.c arch.in private.h +arch.o: arch.c arch.in private.h + +vol.ln: vol.c vol.in private.h +vol.o: vol.c vol.in private.h + +ascii.ln: ascii.c ascii.in term.h +ascii.o: ascii.c ascii.in term.h + +msec.ln: msec.c msec.in private.h +msec.o: msec.c msec.in private.h + +st.ln: st.c st.in private.h +st.o: st.c st.in private.h + macro.ln: macro.c private.h macro.o: macro.c private.h @@ -269,7 +221,7 @@ 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.105 2009/03/04 14:41:40 kristaps Exp $$ > .dist/mdocml/pkg/PLIST + echo @comment $$OpenBSD: Makefile,v 1.130 2009/03/17 09:33:02 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 @@ -284,9 +236,7 @@ mdocml-oport-$(VERSION).tar.gz: mdocml-$(VERSION).tar. 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/