=================================================================== RCS file: /cvs/mandoc/Makefile,v retrieving revision 1.65 retrieving revision 1.74 diff -u -p -r1.65 -r1.74 --- mandoc/Makefile 2009/01/21 11:35:26 1.65 +++ mandoc/Makefile 2009/02/21 19:05:28 1.74 @@ -1,11 +1,11 @@ VERSION = 1.2.0 -CFLAGS += -W -Wall -Wno-unused-parameter -g +CFLAGS += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g LIBLNS = macro.ln mdoc.ln hash.ln strings.ln xstd.ln argv.ln \ - validate.ln action.ln + validate.ln action.ln -BINLNS = tree.ln mdocml.ln +BINLNS = mdocml.ln term.ln tree.ln termact.ln LNS = $(LIBLNS) $(BINLNS) @@ -14,16 +14,16 @@ LLNS = llib-llibmdoc.ln llib-lmdocml.ln LIBS = libmdoc.a LIBOBJS = macro.o mdoc.o hash.o strings.o xstd.o argv.o \ - validate.o action.o + validate.o action.o -BINOBJS = tree.o mdocml.o +BINOBJS = mdocml.o term.o tree.o termact.o OBJS = $(LIBOBJS) $(BINOBJS) SRCS = macro.c mdoc.c mdocml.c hash.c strings.c xstd.c argv.c \ - validate.c action.c tree.c + validate.c action.c term.c tree.c termact.c -HEADS = mdoc.h private.h +HEADS = mdoc.h private.h term.h MANS = mdocml.1 mdoc.3 @@ -76,7 +76,14 @@ SUCCEED = regress/test.prologue.05 \ regress/test.prologue.17 \ regress/test.prologue.20 \ regress/test.sh.00 \ - regress/test.name.00 + regress/test.name.00 \ + 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 all: $(BINS) @@ -89,7 +96,7 @@ dist: mdocml-$(VERSION).tar.gz port: mdocml-oport-$(VERSION).tar.gz -regress:: +regress:: mdocml @for f in $(FAIL); do \ echo "./mdocml $$f" ; \ ./mdocml $$f 2>/dev/null || continue ; exit 1 ; done @@ -125,14 +132,22 @@ macro.ln: macro.c private.h macro.o: macro.c private.h -strings.ln: strings.c private.h - -strings.o: strings.c private.h - tree.ln: tree.c mdoc.h tree.o: tree.c mdoc.h +term.ln: term.c term.h + +term.o: term.c term.h + +termact.ln: termact.c term.h + +termact.o: termact.c term.h + +strings.ln: strings.c private.h + +strings.o: strings.c private.h + hash.ln: hash.c private.h hash.o: hash.c private.h @@ -170,7 +185,7 @@ mdocml-oport-$(VERSION).tar.gz: Makefile.port DESCR 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.65 2009/01/21 11:35:26 kristaps Exp $$ > .dist/mdocml/pkg/PLIST + echo @comment $$OpenBSD: Makefile,v 1.74 2009/02/21 19:05:28 kristaps Exp $$ > .dist/mdocml/pkg/PLIST echo bin/mdocml >> .dist/mdocml/pkg/PLIST echo lib/libmdoc.a >> .dist/mdocml/pkg/PLIST echo include/mdoc.h >> .dist/mdocml/pkg/PLIST @@ -195,5 +210,5 @@ libmdoc.a: $(LIBOBJS) $(AR) rs $@ $(LIBOBJS) mdocml: $(BINOBJS) libmdoc.a - $(CC) $(CFLAGS) -o $@ $(BINOBJS) libmdoc.a + $(CC) $(CFLAGS) -o $@ $(BINOBJS) libmdoc.a