-VERSION = 1.0.2
+VERSION = 1.3.0
+
+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
+
+TREELNS = mdoctree.ln mmain.ln
+
+TERMLNS = mdoctree.ln mmain.ln term.ln
+
+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
+
+TERMOBJS= mdocterm.o mmain.o term.o
+
+TREEOBJS= mdoctree.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
+
+HEADS = mdoc.h private.h term.h mmain.h
+
+MANS = mdoctree.1 mdocterm.1 mdoc.3
+
+BINS = mdocterm mdoctree
+
+CLEAN = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS)
+
+INSTALL = $(SRCS) $(HEADS) Makefile Makefile.port DESCR $(MANS)
+
+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.01 \
+ regress/test.sh.02 \
+ regress/test.sh.03 \
+ regress/test.name.01 \
+ regress/test.name.02 \
+ regress/test.name.03
+
+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.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)
+
+lint: $(LLNS)
-# FIXME
-CFLAGS += -W -Wall -Wno-unused-parameter -g -DDEBUG
-
-LNS = mdocml.ln html.ln xml.ln libmdocml.ln roff.ln ml.ln mlg.ln \
- compat.ln tokens.ln literals.ln tags.ln
-
-LLNS = llib-lmdocml.ln
-
-LIBS = libmdocml.a
-
-OBJS = mdocml.o html.o xml.o libmdocml.o roff.o ml.o mlg.o \
- compat.o tokens.o literals.o tags.o
-
-SRCS = mdocml.c html.c xml.c libmdocml.c roff.c ml.c mlg.c \
- compat.c tokens.c literals.c tags.c
-
-HEADS = libmdocml.h private.h ml.h roff.h html.h
+clean:
+ rm -f $(CLEAN)
-MANS = mdocml.1 index.7
+dist: mdocml-$(VERSION).tar.gz
-HTML = index.html mdocml.html
+port: mdocml-oport-$(VERSION).tar.gz
-XML = index.xml
+regress:: mdocml
+ @for f in $(FAIL); do \
+ echo "./mdocml $$f" ; \
+ ./mdocml $$f 2>/dev/null || continue ; exit 1 ; done
+ @for f in $(SUCCEED); do \
+ echo "./mdocml $$f" ; \
+ ./mdocml $$f 2>/dev/null || exit 1 ; done
-TEXT = index.txt
+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 0444 mdocterm.1 $(PREFIX)/man/man1/
+ install -m 0444 mdocterm.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/
-CLEAN = mdocml mdocml.tgz $(LLNS) $(LNS) $(OBJS) $(LIBS) $(HTML) \
- $(XML) $(TEXT)
+install-dist: mdocml-$(VERSION).tar.gz mdocml-oport-$(VERSION).tar.gz
+ install -m 0644 mdocml-$(VERSION).tar.gz $(PREFIX)/
+ install -m 0644 mdocml-$(VERSION).tar.gz $(PREFIX)/mdocml.tar.gz
+ install -m 0644 mdocml-oport-$(VERSION).tar.gz $(PREFIX)/
+ install -m 0644 mdocml-oport-$(VERSION).tar.gz $(PREFIX)/mdocml-oport.tar.gz
-INSTALL = Makefile $(HEADS) $(SRCS) $(MANS)
+uninstall:
+ rm -f $(PREFIX)/bin/mdocterm
+ rm -f $(PREFIX)/bin/mdoctree
+ rm -f $(PREFIX)/man/man1/mdocterm.1
+ rm -f $(PREFIX)/man/man1/mdoctree.1
+ rm -f $(PREFIX)/man/man3/mdoc.3
+ rm -f $(PREFIX)/lib/libmdoc.a
+ rm -f $(PREFIX)/include/mdoc.h
-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 \
- test.66 test.69 test.70
+macro.ln: macro.c private.h
+macro.o: macro.c private.h
-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
+term.ln: term.c term.h
+term.o: term.c term.h
-all: mdocml
+strings.ln: strings.c private.h
+strings.o: strings.c private.h
-lint: llib-lmdocml.ln
+hash.ln: hash.c private.h
+hash.o: hash.c private.h
-dist: mdocml.tgz mdocml-port.tgz
+mdoc.ln: mdoc.c private.h
+mdoc.o: mdoc.c private.h
-www: all $(HTML) $(XML) $(TEXT)
+mdocterm.ln: mdocterm.c mmain.h
+mdocterm.o: mdocterm.c mmain.h
-regress: mdocml
- @for f in $(FAIL); do \
- echo "./mdocml $$f" ; \
- ./mdocml -v $$f 1>/dev/null 2>/dev/null || continue ; \
- done
- @for f in $(SUCCEED); do \
- echo "./mdocml $$f" ; \
- ./mdocml -v $$f 1>/dev/null || exit 1 ; \
- done
+mdoctree.ln: mdoctree.c mmain.h
+mdoctree.o: mdoctree.c mmain.h
-mdocml: mdocml.o libmdocml.a
- $(CC) $(CFLAGS) -o $@ mdocml.o libmdocml.a
+xstd.ln: xstd.c private.h
+xstd.o: xstd.c private.h
-clean:
- rm -f $(CLEAN)
+argv.ln: argv.c private.h
+argv.o: argv.c private.h
-index.html: index.7 mdocml.css
- ./mdocml -Wall -fhtml -e -o $@ index.7
+validate.ln: validate.c private.h
+validate.o: validate.c private.h
-index.xml: index.7 mdocml.css
- ./mdocml -Wall -o $@ index.7
+action.ln: action.c private.h
+action.o: action.c private.h
-index.txt: index.7
- cp -f index.7 index.txt
+mmain.ln: mmain.c mmain.h
+mmain.o: mmain.c mmain.h
-mdocml.html: mdocml.1 mdocml.css
- ./mdocml -Wall -fhtml -e -o $@ mdocml.1
+private.h: mdoc.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)/
+mmain.h: 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/
+term.h: mdoc.h
-mdocml-port.tgz: $(INSTALL)
+mdocml-oport-$(VERSION).tar.gz: Makefile.port DESCR
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
+ md5 mdocml-$(VERSION).tar.gz > .dist/mdocml/distinfo
+ 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$$ > .dist/mdocml/pkg/PLIST
- echo bin/mdocml >> .dist/mdocml/pkg/PLIST
- echo @man man/man1/mdocml.1 >> .dist/mdocml/pkg/PLIST
+ echo bin/mdocterm >> .dist/mdocml/pkg/PLIST
+ echo bin/mdoctree >> .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/man3/mdoc.3 >> .dist/mdocml/pkg/PLIST
( cd .dist/ && tar zcf ../$@ mdocml/ )
rm -rf .dist/
-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
- $(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
-
-mdocml.ln: mdocml.c libmdocml.h
-
-mdocml.o: mdocml.c libmdocml.h
-
-libmdocml.a: libmdocml.o html.o xml.o roff.o ml.o mlg.o compat.o tokens.o literals.o tags.o
- $(AR) rs $@ libmdocml.o html.o xml.o roff.o ml.o mlg.o compat.o tokens.o literals.o tags.o
-
-xml.ln: xml.c private.h libmdocml.h ml.h
-
-xml.o: xml.c private.h libmdocml.h ml.h
-
-html.ln: html.c private.h libmdocml.h
-
-html.o: html.c private.h libmdocml.h
-
-tags.ln: tags.c html.h
-
-tags.o: tags.c html.h
-
-roff.ln: roff.c private.h roff.h libmdocml.h
-
-roff.o: roff.c private.h roff.h libmdocml.h
-
-libmdocml.ln: libmdocml.c private.h libmdocml.h
-
-libmdocml.o: libmdocml.c private.h libmdocml.h
-
-ml.ln: ml.c private.h libmdocml.h ml.h
-
-ml.o: ml.c private.h libmdocml.h ml.h
-
-mlg.ln: mlg.c private.h libmdocml.h ml.h
+mdocml-$(VERSION).tar.gz: $(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/
-mlg.o: mlg.c private.h libmdocml.h ml.h
+llib-llibmdoc.ln: $(LIBLNS)
+ $(LINT) $(LINTFLAGS) -Clibmdoc $(LIBLNS)
-compat.ln: compat.c
+llib-lmdoctree.ln: $(TREELNS) llib-llibmdoc.ln
+ $(LINT) $(LINTFLAGS) -Cmdoctree $(TREELNS) llib-llibmdoc.ln
-compat.o: compat.c
+llib-lmdocterm.ln: $(TERMLNS) llib-llibmdoc.ln
+ $(LINT) $(LINTFLAGS) -Cmdocterm $(TERMLNS) llib-llibmdoc.ln
-html.h: ml.h
+libmdoc.a: $(LIBOBJS)
+ $(AR) rs $@ $(LIBOBJS)
-ml.h: private.h
+mdocterm: $(TERMOBJS) libmdoc.a
+ $(CC) $(CFLAGS) -o $@ $(TERMOBJS) libmdoc.a
-private.h: libmdocml.h
+mdoctree: $(TREEOBJS) libmdoc.a
+ $(CC) $(CFLAGS) -o $@ $(TREEOBJS) libmdoc.a