=================================================================== RCS file: /cvs/mandoc/Makefile,v retrieving revision 1.97 retrieving revision 1.143 diff -u -p -r1.97 -r1.143 --- mandoc/Makefile 2009/02/28 22:27:17 1.97 +++ mandoc/Makefile 2009/03/22 19:01:11 1.143 @@ -1,128 +1,57 @@ .SUFFIXES: .html .sgml -VERSION = 1.3.12 -VDATE = 28 February 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) -CFLAGS += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g +VERSION = 1.6.8 +VDATE = 21 March 2009 -LIBLNS = macro.ln mdoc.ln hash.ln strings.ln xstd.ln argv.ln \ - validate.ln action.ln +VFLAGS = -DVERSION=\"$(VERSION)\" +CFLAGS += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g +LINTFLAGS += $(VFLAGS) +CFLAGS += $(VFLAGS) -TREELNS = mdoctree.ln mmain.ln +# If you want to strip `Xo/Xc' macro pairs, enable this. Really, only +# OpenBSD should be doing this while it kicks its cruft. +CFLAGS += -DSTRIP_XO -TERMLNS = mdoctree.ln mmain.ln term.ln +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 +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 +LIBSRCS = macro.c mdoc.c hash.c strings.c xstd.c argv.c validate.c \ + action.c lib.c att.c arch.c vol.c msec.c st.c -LINTLNS = mdoclint.ln mmain.ln +MAINLNS = main.ln term.ln ascii.ln terminal.ln tree.ln compat.ln +MAINOBJS = main.o term.o ascii.o terminal.o tree.o compat.o +MAINSRCS = main.c term.c ascii.c terminal.c tree.c compat.c -LNS = $(LIBLNS) $(TREELNS) $(TERMLNS) +LLNS = llib-llibmdoc.ln llib-lmandoc.ln +LNS = $(MAINLNS) $(LIBLNS) +LIBS = libmdoc.a +OBJS = $(LIBOBJS) $(MAINOBJS) +SRCS = $(LIBSRCS) $(MAINSRCS) +DATAS = arch.in att.in lib.in msec.in st.in vol.in ascii.in +HEADS = mdoc.h private.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-nport-$(VERSION).tar.gz +MANS = mandoc.1 mdoc.3 mdoc.7 manuals.7 +BINS = mandoc +CLEAN = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) $(TARGZS) +INSTALL = $(SRCS) $(HEADS) Makefile DESCR $(MANS) $(SGMLS) \ + $(STATICS) Makefile.netbsd Makefile.openbsd $(DATAS) -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 - -TERMOBJS= mdocterm.o mmain.o term.o - -TREEOBJS= mdoctree.o mmain.o - -LINTOBJS= mdoclint.o mmain.o - -OBJS = $(LIBOBJS) $(TERMOBJS) $(TREEOBJS) - -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 - -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) - -INSTALL = $(SRCS) $(HEADS) Makefile DESCR $(MANS) $(SGMLS) \ - $(STATICS) Makefile.netbsd Makefile.openbsd - -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 - -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 = $(FAIL) $(SUCCEED) - all: $(BINS) lint: $(LLNS) @@ -148,40 +77,40 @@ 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 $(PREFIX)/bin/ - mkdir -p $(PREFIX)/include/mdoc/ - mkdir -p $(PREFIX)/lib/ - mkdir -p $(PREFIX)/man/man1/ - install -m 0755 mdocterm $(PREFIX)/bin/ - install -m 0755 mdoctree $(PREFIX)/bin/ - install -m 0755 mdoclint $(PREFIX)/bin/ - install -m 0444 mdocterm.1 $(PREFIX)/man/man1/ - install -m 0444 mdoctree.1 $(PREFIX)/man/man1/ - install -m 0444 mdoclint.1 $(PREFIX)/man/man1/ - install -m 0444 mdoc.3 $(PREFIX)/man/man3/ - install -m 0644 libmdoc.a $(PREFIX)/lib/ - install -m 0444 mdoc.h $(PREFIX)/include/ + mkdir -p $(BINDIR) + mkdir -p $(MANDIR)/man1 + mkdir -p $(MANDIR)/man7 + $(INSTALL_PROGRAM) mandoc $(BINDIR) + $(INSTALL_MAN) mandoc.1 $(MANDIR)/man1 + $(INSTALL_MAN) mdoc.7 $(MANDIR)/man7 uninstall: - rm -f $(PREFIX)/bin/mdocterm - rm -f $(PREFIX)/bin/mdoctree - rm -f $(PREFIX)/bin/mdoclint - rm -f $(PREFIX)/man/man1/mdocterm.1 - rm -f $(PREFIX)/man/man1/mdoctree.1 - rm -f $(PREFIX)/man/man1/mdoclint.1 - rm -f $(PREFIX)/man/man3/mdoc.3 - rm -f $(PREFIX)/lib/libmdoc.a - rm -f $(PREFIX)/include/mdoc.h + rm -f $(BINDIR)/mandoc + rm -f $(MANDIR)/man1/mandoc.1 + rm -f $(MANDIR)/man7/mdoc.7 +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 @@ -197,15 +126,12 @@ hash.o: hash.c private.h mdoc.ln: mdoc.c private.h mdoc.o: mdoc.c private.h -mdocterm.ln: mdocterm.c mmain.h -mdocterm.o: mdocterm.c mmain.h +main.ln: main.c mdoc.h +main.o: main.c mdoc.h -mdoclint.ln: mdoclint.c mmain.h -mdoclint.o: mdoclint.c mmain.h +terminal.ln: terminal.c term.h +terminal.o: terminal.c term.h -mdoctree.ln: mdoctree.c mmain.h -mdoctree.o: mdoctree.c mmain.h - xstd.ln: xstd.c private.h xstd.o: xstd.c private.h @@ -218,13 +144,8 @@ validate.o: validate.c private.h action.ln: action.c private.h action.o: action.c private.h -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 @@ -236,15 +157,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/ @@ -256,49 +171,31 @@ 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.97 2009/02/28 22:27:17 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.143 2009/03/22 19:01:11 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-$(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-lmdoctree.ln: $(TREELNS) llib-llibmdoc.ln - $(LINT) $(LINTFLAGS) -Cmdoctree $(TREELNS) llib-llibmdoc.ln +llib-lmandoc.ln: $(MAINLNS) llib-llibmdoc.ln + $(LINT) $(LINTFLAGS) -Cmandoc $(MAINLNS) llib-llibmdoc.ln -llib-lmdocterm.ln: $(TERMLNS) llib-llibmdoc.ln - $(LINT) $(LINTFLAGS) -Cmdocterm $(TERMLNS) llib-llibmdoc.ln - libmdoc.a: $(LIBOBJS) $(AR) rs $@ $(LIBOBJS) -mdocterm: $(TERMOBJS) libmdoc.a - $(CC) $(CFLAGS) -o $@ $(TERMOBJS) libmdoc.a +mandoc: $(MAINOBJS) libmdoc.a + $(CC) $(CFLAGS) -o $@ $(MAINOBJS) libmdoc.a -mdoctree: $(TREEOBJS) libmdoc.a - $(CC) $(CFLAGS) -o $@ $(TREEOBJS) libmdoc.a - -mdoclint: $(LINTOBJS) libmdoc.a - $(CC) $(CFLAGS) -o $@ $(LINTOBJS) libmdoc.a - .sgml.html: validate $< sed -e "s!@VERSION@!$(VERSION)!" -e "s!@VDATE@!$(VDATE)!" $< > $@ -