Cleaned up ctype functions (netbsd).

[mandoc.git] / Makefile

diff --git a/Makefile b/Makefile
index 0497c41f071440ae30725b4f17f1382239dfa6fc..ffdb61031199ffa3a14a5b0b201f7679a5e9199f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,37 +1,69 @@
-VERSION        = 1.2.0
+.SUFFIXES:     .html .sgml

 
 

-CFLAGS += -W -Wall -Wno-unused-parameter -g 
+VERSION        = 1.3.18
+VDATE  = 04 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)
+
+CFLAGS += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g 

 
 LIBLNS = macro.ln mdoc.ln hash.ln strings.ln xstd.ln argv.ln \
 
 LIBLNS = macro.ln mdoc.ln hash.ln strings.ln xstd.ln argv.ln \

-         validate.ln action.ln
+         validate.ln action.ln 
+
+TREELNS        = mdoctree.ln mmain.ln 
+
+TERMLNS        = mdoctree.ln mmain.ln term.ln

 
 

-BINLNS = tree.ln mdocml.ln
+LINTLNS        = mdoclint.ln mmain.ln

 
 

-LNS    = $(LIBLNS) $(BINLNS)
+LNS    = $(LIBLNS) $(TREELNS) $(TERMLNS)

 
 

-LLNS   = llib-llibmdoc.ln llib-lmdocml.ln
+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
 
 
 LIBS   = libmdoc.a
 
 LIBOBJS        = macro.o mdoc.o hash.o strings.o xstd.o argv.o \
          validate.o action.o
 

-BINOBJS        = tree.o mdocml.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

 
 

-OBJS   = $(LIBOBJS) $(BINOBJS)
+SGMLS  = index.sgml

 
 

-SRCS   = macro.c mdoc.c mdocml.c hash.c strings.c xstd.c argv.c \
-         validate.c action.c tree.c
+HTMLS  = index.html

 
 

-HEADS  = mdoc.h private.h
+STATICS        = style.css external.png

 
 

-MANS   = mdocml.1 mdoc.3
+TARGZS = mdocml-$(VERSION).tar.gz mdocml-oport-$(VERSION).tar.gz \
+         mdocml-nport-$(VERSION).tar.gz

 
 

-BINS   = mdocml
+MANS   = mdoctree.1 mdocterm.1 mdoclint.1 mdoc.3

 
 

-CLEAN  = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS)
+BINS   = mdocterm mdoctree mdoclint

 
 

-INSTALL        = $(SRCS) $(HEADS) Makefile Makefile.port DESCR $(MANS)
+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 \
 
 FAIL   = regress/test.empty \
          regress/test.prologue.00 \


@@ -48,7 +80,30 @@ FAIL = regress/test.empty \
          regress/test.prologue.21 \
          regress/test.prologue.22 \
          regress/test.prologue.23 \
          regress/test.prologue.21 \
          regress/test.prologue.22 \
          regress/test.prologue.23 \

-         regress/test.prologue.24
+         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 \
+         regress/test.escape.14 \
+         regress/test.argv.01 \
+         regress/test.argv.02

 
 SUCCEED        = regress/test.prologue.05 \
          regress/test.prologue.07 \
 
 SUCCEED        = regress/test.prologue.05 \
          regress/test.prologue.07 \


@@ -59,7 +114,29 @@ SUCCEED     = regress/test.prologue.05 \
          regress/test.prologue.12 \
          regress/test.prologue.14 \
          regress/test.prologue.17 \
          regress/test.prologue.12 \
          regress/test.prologue.14 \
          regress/test.prologue.17 \

-         regress/test.prologue.20
+         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/test.escape.13 \
+         regress/test.argv.00
+
+REGRESS        = $(FAIL) $(SUCCEED)

 
 all:   $(BINS)
 
 
 all:   $(BINS)
 


@@ -68,115 +145,176 @@ lint:    $(LLNS)
 clean:
        rm -f $(CLEAN)
 
 clean:
        rm -f $(CLEAN)
 

+cleanlint:
+       rm -f $(LNS) $(LLNS)
+

 dist:  mdocml-$(VERSION).tar.gz
 
 dist:  mdocml-$(VERSION).tar.gz
 

-port:  mdocml-oport-$(VERSION).tar.gz
+port:  mdocml-oport-$(VERSION).tar.gz mdocml-nport-$(VERSION).tar.gz
+
+www:   $(HTMLS) $(TARGZS)

 
 

-regress::
+installwww: www
+       install -m 0444 $(HTMLS) $(STATICS) $(PREFIX)/
+       install -m 0444 mdocml-$(VERSION).tar.gz $(PREFIX)/snapshots/
+       install -m 0444 mdocml-$(VERSION).tar.gz $(PREFIX)/snapshots/mdocml.tar.gz
+       install -m 0444 mdocml-oport-$(VERSION).tar.gz $(PREFIX)/ports-openbsd/
+       install -m 0444 mdocml-oport-$(VERSION).tar.gz $(PREFIX)/ports-openbsd/mdocml.tar.gz
+       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 $(FAIL) $(SUCCEED)

        @for f in $(FAIL); do \
        @for f in $(FAIL); do \

-               echo "./mdocml $$f" ; \
-               ./mdocml $$f 2>/dev/null || continue ; exit 1 ; done
+               echo "./mdoclint $$f" ; \
+               ./mdoclint $$f 2>/dev/null || continue ; exit 1 ; done

        @for f in $(SUCCEED); do \
        @for f in $(SUCCEED); do \

-               echo "./mdocml $$f" ; \
-               ./mdocml $$f 2>/dev/null || exit 1 ; done
+               echo "./mdoclint $$f" ; \
+               ./mdoclint $$f 2>/dev/null || exit 1 ; done

 
 install:
 
 install:

-       mkdir -p $(PREFIX)/bin/
-       mkdir -p $(PREFIX)/include/mdoc/
-       mkdir -p $(PREFIX)/lib/
-       mkdir -p $(PREFIX)/man/man1/
-       install -m 0755 mdocml $(PREFIX)/bin/
-       install -m 0444 mdocml.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/
-
-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
+       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)

 
 uninstall:
 
 uninstall:

-       rm -f $(PREFIX)/bin/mdocml
-       rm -f $(PREFIX)/man/man1/mdocml.1
-       rm -f $(PREFIX)/man/man3/mdoc.3
-       rm -f $(PREFIX)/lib/libmdoc.a
-       rm -f $(PREFIX)/include/mdoc.h
+       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

 
 macro.ln: macro.c private.h
 
 macro.ln: macro.c private.h

-

 macro.o: macro.c private.h
 
 macro.o: macro.c private.h
 

-strings.ln: strings.c private.h
+term.ln: term.c term.h 
+term.o: term.c term.h

 
 

+strings.ln: strings.c private.h

 strings.o: strings.c private.h
 
 strings.o: strings.c private.h
 

-tree.ln: tree.c mdoc.h
-
-tree.o: tree.c mdoc.h
-

 hash.ln: hash.c private.h
 hash.ln: hash.c private.h

-

 hash.o: hash.c private.h
 
 mdoc.ln: mdoc.c private.h
 hash.o: hash.c private.h
 
 mdoc.ln: mdoc.c private.h

-

 mdoc.o: mdoc.c private.h
 
 mdoc.o: mdoc.c private.h
 

-mdocml.ln: mdocml.c mdoc.h
+mdocterm.ln: mdocterm.c mmain.h
+mdocterm.o: mdocterm.c mmain.h

 
 

-mdocml.o: mdocml.c mdoc.h
+mdoclint.ln: mdoclint.c mmain.h
+mdoclint.o: mdoclint.c mmain.h

 
 

-xstd.ln: xstd.c private.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
 
 argv.ln: argv.c private.h
 xstd.o: xstd.c private.h
 
 argv.ln: argv.c private.h

-

 argv.o: argv.c private.h
 
 validate.ln: validate.c private.h
 argv.o: argv.c private.h
 
 validate.ln: validate.c private.h

-

 validate.o: validate.c private.h
 
 action.ln: action.c private.h
 validate.o: validate.c private.h
 
 action.ln: action.c private.h

-

 action.o: 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
 
 private.h: mdoc.h
 

-mdocml-oport-$(VERSION).tar.gz: Makefile.port DESCR
+mmain.h: mdoc.h
+
+term.h: mdoc.h
+
+mdocml-nport-$(VERSION).tar.gz: mdocml-$(VERSION).tar.gz Makefile.netbsd DESCR
+       mkdir -p .dist/mdocml/
+       sed -e "s!@VERSION@!$(VERSION)!" Makefile.netbsd > \
+               .dist/mdocml/Makefile
+       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/
+       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
+       ( cd .dist/ && tar zcf ../$@ mdocml/ )
+       rm -rf .dist/
+
+mdocml-oport-$(VERSION).tar.gz: mdocml-$(VERSION).tar.gz Makefile.openbsd DESCR

        mkdir -p .dist/mdocml/pkg
        mkdir -p .dist/mdocml/pkg

-       sed -e "s!@VERSION@!$(VERSION)!" Makefile.port > .dist/mdocml/Makefile
+       sed -e "s!@VERSION@!$(VERSION)!" Makefile.openbsd > \
+               .dist/mdocml/Makefile

        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
        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 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 lib/libmdoc.a >> .dist/mdocml/pkg/PLIST
        echo include/mdoc.h >> .dist/mdocml/pkg/PLIST

-       echo @man man/man1/mdocml.1 >> .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
        ( cd .dist/ && tar zcf ../$@ mdocml/ )
        rm -rf .dist/
 
 mdocml-$(VERSION).tar.gz: $(INSTALL)
        mkdir -p .dist/mdocml/mdocml-$(VERSION)/
        echo @man man/man3/mdoc.3 >> .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 $(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)
 
        ( cd .dist/mdocml/ && tar zcf ../../$@ mdocml-$(VERSION)/ )
        rm -rf .dist/
 
 llib-llibmdoc.ln: $(LIBLNS)
        $(LINT) $(LINTFLAGS) -Clibmdoc $(LIBLNS)
 

-llib-lmdocml.ln: $(BINLNS) llib-llibmdoc.ln
-       $(LINT) $(LINTFLAGS) -Cmdocml $(BINLNS) llib-llibmdoc.ln
+llib-lmdoctree.ln: $(TREELNS) llib-llibmdoc.ln
+       $(LINT) $(LINTFLAGS) -Cmdoctree $(TREELNS) llib-llibmdoc.ln
+
+llib-lmdocterm.ln: $(TERMLNS) llib-llibmdoc.ln
+       $(LINT) $(LINTFLAGS) -Cmdocterm $(TERMLNS) llib-llibmdoc.ln

 
 libmdoc.a: $(LIBOBJS)
        $(AR) rs $@ $(LIBOBJS)
 
 
 libmdoc.a: $(LIBOBJS)
        $(AR) rs $@ $(LIBOBJS)
 

-mdocml:        $(BINOBJS) libmdoc.a
-       $(CC) $(CFLAGS) -o $@ $(BINOBJS) libmdoc.a
+mdocterm: $(TERMOBJS) libmdoc.a
+       $(CC) $(CFLAGS) -o $@ $(TERMOBJS) 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)!" $< > $@