=================================================================== RCS file: /cvs/mandoc/Makefile,v retrieving revision 1.127 retrieving revision 1.143 diff -u -p -r1.127 -r1.143 --- mandoc/Makefile 2009/03/16 22:19:19 1.127 +++ mandoc/Makefile 2009/03/22 19:01:11 1.143 @@ -1,78 +1,57 @@ .SUFFIXES: .html .sgml -VERSION = 1.5.1 -VDATE = 15 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.6.8 +VDATE = 21 March 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 +# 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 -TREELNS = mdoctree.ln mmain.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 -TERMLNS = mdoctree.ln mmain.ln term.ln ascii.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 -LINTLNS = mdoclint.ln mmain.ln +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) -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 ascii.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 - -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 - -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 mdoc.7 - -BINS = mdocterm mdoctree mdoclint - -CLEAN = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) \ - $(TARGZS) - -INSTALL = $(SRCS) $(HEADS) Makefile DESCR $(MANS) $(SGMLS) \ - $(STATICS) Makefile.netbsd Makefile.openbsd $(DATAS) - all: $(BINS) lint: $(LLNS) @@ -100,30 +79,16 @@ installwww: www 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 lib.in private.h lib.o: lib.c lib.in private.h @@ -161,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 @@ -182,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 @@ -200,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/ @@ -220,16 +171,10 @@ 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.127 2009/03/16 22:19:19 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/ @@ -242,25 +187,15 @@ mdocml-$(VERSION).tar.gz: $(INSTALL) 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)!" $< > $@ -