=================================================================== RCS file: /cvs/mandoc/Makefile,v retrieving revision 1.47 retrieving revision 1.59 diff -u -p -r1.47 -r1.59 --- mandoc/Makefile 2008/12/10 14:42:45 1.47 +++ mandoc/Makefile 2009/01/17 16:47:02 1.59 @@ -1,160 +1,101 @@ -VERSION = 1.0.3 +VERSION = 1.1.0 -# FIXME -CFLAGS += -W -Wall -Wno-unused-parameter -g -DDEBUG +CFLAGS += -W -Wall -Wno-unused-parameter -g -LNS = mdocml.ln html.ln xml.ln libmdocml.ln roff.ln ml.ln mlg.ln \ - compat.ln tokens.ln literals.ln tags.ln noop.ln +LNS = macro.ln mdoc.ln mdocml.ln hash.ln strings.ln xstd.ln argv.ln validate.ln action.ln tree.ln -LLNS = llib-lmdocml.ln +LLNS = llib-llibmdoc.ln llib-lmdocml.ln -LIBS = libmdocml.a +LIBS = libmdoc.a -OBJS = mdocml.o html.o xml.o libmdocml.o roff.o ml.o mlg.o \ - compat.o tokens.o literals.o tags.o noop.o +OBJS = macro.o mdoc.o mdocml.o hash.o strings.o xstd.o argv.o validate.o action.o tree.o -SRCS = mdocml.c html.c xml.c libmdocml.c roff.c ml.c mlg.c \ - compat.c tokens.c literals.c tags.c noop.c +SRCS = macro.c mdoc.c mdocml.c hash.c strings.c xstd.c argv.c validate.c action.c tree.c -HEADS = libmdocml.h private.h ml.h roff.h html.h +HEADS = mdoc.h -MANS = mdocml.1 index.7 +BINS = mdocml -HTML = index.html mdocml.html +CLEAN = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) -XML = index.xml +SUCCESS = test.1 test.7 test.8 test.9 test.11 test.11 test.12 test.16 \ + test.17 test.19 test.20 test.21 test.23 test.25 test.27 \ + test.28 test.29 test.31 test.32 test.33 test.34 test.35 \ + test.38 test.39 test.40 test.41 test.42 test.43 test.44 \ + test.45 test.46 test.47 test.49 test.51 test.52 test.53 \ + test.54 test.55 test.56 test.57 test.58 test.59 test.60 \ + test.62 test.67 test.68 test.71 test.72 test.73 test.74 \ + test.75 -TEXT = index.txt - -CLEAN = mdocml mdocml.tgz $(LLNS) $(LNS) $(OBJS) $(LIBS) $(HTML) \ - $(XML) $(TEXT) - -INSTALL = Makefile $(HEADS) $(SRCS) $(MANS) - -FAIL = test.0 test.1 test.2 test.3 test.4 test.5 test.6 \ - test.15 test.20 test.22 test.24 test.26 test.27 test.30 \ - test.36 test.37 test.40 test.50 test.61 test.64 test.65 \ +FAIL = test.0 test.2 test.3 test.4 test.5 test.6 test.13 test.14 \ + test.15 test.18 test.22 test.24 test.26 test.30 test.36 \ + test.37 test.48 test.50 test.61 test.63 test.64 test.65 \ test.66 test.69 test.70 -SUCCEED = test.7 test.8 test.9 test.10 test.11 test.12 test.13 \ - test.14 test.16 test.17 test.18 test.19 test.21 test.23 \ - test.25 test.28 test.29 test.31 test.32 test.33 test.34 \ - test.35 test.38 test.39 test.41 test.42 test.43 test.44 \ - test.45 test.46 test.47 test.48 test.49 test.51 test.52 \ - test.54 test.55 test.56 test.57 test.58 test.59 test.60 \ - test.62 test.63 test.67 test.68 test.71 test.72 test.73 +all: $(BINS) -all: mdocml +lint: $(LLNS) -lint: llib-lmdocml.ln +mdocml: mdocml.o tree.o libmdoc.a + $(CC) $(CFLAGS) -o $@ mdocml.o tree.o libmdoc.a -dist: mdocml.tgz mdocml-port.tgz +clean: + rm -f $(CLEAN) -www: all $(HTML) $(XML) $(TEXT) - -regress: mdocml - @for f in $(FAIL); do \ +regress: mdocml $(SUCCESS) $(FAIL) + @for f in $(SUCCESS) ; do \ echo "./mdocml $$f" ; \ - ./mdocml -v $$f 1>/dev/null 2>/dev/null || continue ; \ + ./mdocml $$f || exit 1 ; \ done - @for f in $(SUCCEED); do \ - echo "./mdocml $$f" ; \ - ./mdocml -v $$f 1>/dev/null || exit 1 ; \ - done -mdocml: mdocml.o libmdocml.a - $(CC) $(CFLAGS) -o $@ mdocml.o libmdocml.a +llib-llibmdoc.ln: macro.ln mdoc.ln hash.ln strings.ln xstd.ln argv.ln validate.ln action.ln + $(LINT) $(LINTFLAGS) -Clibmdoc mdoc.ln macro.ln hash.ln strings.ln xstd.ln argv.ln validate.ln action.ln -clean: - rm -f $(CLEAN) +llib-lmdocml.ln: mdocml.ln tree.ln llib-llibmdoc.ln + $(LINT) $(LINTFLAGS) -Cmdocml mdocml.ln tree.ln llib-llibmdoc.ln -index.html: index.7 mdocml.css - ./mdocml -Wall -fhtml -e -o $@ index.7 +macro.ln: macro.c private.h -index.xml: index.7 mdocml.css - ./mdocml -Wall -o $@ index.7 +macro.o: macro.c private.h -index.txt: index.7 - cp -f index.7 index.txt +strings.ln: strings.c private.h -mdocml.html: mdocml.1 mdocml.css - ./mdocml -Wall -fhtml -e -o $@ mdocml.1 +strings.o: strings.c private.h -install-www: www dist - install -m 0644 mdocml.tgz $(PREFIX)/mdocml-$(VERSION).tgz - install -m 0644 mdocml.tgz $(PREFIX)/mdocml.tgz - install -m 0644 mdocml-port.tgz $(PREFIX)/mdocml-port-$(VERSION).tgz - install -m 0644 mdocml-port.tgz $(PREFIX)/mdocml-port.tgz - install -m 0644 $(HTML) $(XML) $(TEXT) $(PREFIX)/ +tree.ln: tree.c mdoc.h -mdocml.tgz: $(INSTALL) - mkdir -p .dist/mdocml/mdocml-$(VERSION)/ - install -m 0644 $(INSTALL) .dist/mdocml/mdocml-$(VERSION)/ - ( cd .dist/mdocml/ && tar zcf ../../$@ mdocml-$(VERSION)/ ) - rm -rf .dist/ +tree.o: tree.c mdoc.h -mdocml-port.tgz: $(INSTALL) - mkdir -p .dist/mdocml/pkg - sed -e "s!@VERSION@!$(VERSION)!" Makefile.port > .dist/mdocml/Makefile - md5 mdocml-$(VERSION).tgz > .dist/mdocml/distinfo - rmd160 mdocml-$(VERSION).tgz >> .dist/mdocml/distinfo - sha1 mdocml-$(VERSION).tgz >> .dist/mdocml/distinfo - install -m 0644 DESCR .dist/mdocml/pkg/DESCR - echo @comment $$OpenBSD: Makefile,v 1.47 2008/12/10 14:42:45 kristaps Exp $$ > .dist/mdocml/pkg/PLIST - echo bin/mdocml >> .dist/mdocml/pkg/PLIST - echo @man man/man1/mdocml.1 >> .dist/mdocml/pkg/PLIST - ( cd .dist/ && tar zcf ../$@ mdocml/ ) - rm -rf .dist/ +hash.ln: hash.c private.h -llib-lmdocml.ln: mdocml.ln libmdocml.ln html.ln xml.ln roff.ln ml.ln mlg.ln compat.ln tokens.ln literals.ln tags.ln noop.ln - $(LINT) $(LINTFLAGS) -Cmdocml mdocml.ln libmdocml.ln html.ln xml.ln roff.ln ml.ln mlg.ln compat.ln tokens.ln literals.ln tags.ln noop.ln +hash.o: hash.c private.h -mdocml.ln: mdocml.c libmdocml.h +mdoc.ln: mdoc.c private.h -mdocml.o: mdocml.c libmdocml.h +mdoc.o: mdoc.c private.h -libmdocml.a: libmdocml.o html.o xml.o roff.o ml.o mlg.o compat.o tokens.o literals.o tags.o noop.o - $(AR) rs $@ libmdocml.o html.o xml.o roff.o ml.o mlg.o compat.o tokens.o literals.o tags.o noop.o +mdocml.ln: mdocml.c mdoc.h -xml.ln: xml.c ml.h +mdocml.o: mdocml.c mdoc.h -xml.o: xml.c ml.h +xstd.ln: xstd.c private.h -html.ln: html.c private.h +xstd.o: xstd.c private.h -html.o: html.c private.h +argv.ln: argv.c private.h -tags.ln: tags.c html.h +argv.o: argv.c private.h -tags.o: tags.c html.h +validate.ln: validate.c private.h -roff.ln: roff.c private.h +validate.o: validate.c private.h -roff.o: roff.c private.h +action.ln: action.c private.h -libmdocml.ln: libmdocml.c private.h +action.o: action.c private.h -libmdocml.o: libmdocml.c private.h +private.h: mdoc.h -ml.ln: ml.c ml.h - -ml.o: ml.c ml.h - -mlg.ln: mlg.c ml.h - -mlg.o: mlg.c ml.h - -compat.ln: compat.c - -compat.o: compat.c - -noop.ln: noop.c private.h - -noop.o: noop.c private.h - -html.h: ml.h - -ml.h: private.h - -private.h: libmdocml.h +libmdoc.a: macro.o mdoc.o hash.o strings.o xstd.o argv.o validate.o action.o + $(AR) rs $@ macro.o mdoc.o hash.o strings.o xstd.o argv.o validate.o action.o