Complete eqn.7 parsing. Features all productions from the original 1975

[mandoc.git] / Makefile

diff --git a/Makefile b/Makefile
index e0b5203db11b5f32e61321d948f57dd83687fcbb..eb9efb823928d8bd647908bade5daac6c224ff2d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,18 @@
 .PHONY:         clean install installwww
 .SUFFIXES:      .sgml .html .md5 .h .h.html
-.SUFFIXES:      .1       .3       .7
-.SUFFIXES:      .1.txt   .3.txt   .7.txt
-.SUFFIXES:      .1.pdf   .3.pdf   .7.pdf
-.SUFFIXES:      .1.ps    .3.ps    .7.ps
-.SUFFIXES:      .1.html  .3.html  .7.html 
-.SUFFIXES:      .1.xhtml .3.xhtml .7.xhtml 
+.SUFFIXES:      .1       .3       .7       .8
+.SUFFIXES:      .1.txt   .3.txt   .7.txt   .8.txt
+.SUFFIXES:      .1.pdf   .3.pdf   .7.pdf   .8.pdf
+.SUFFIXES:      .1.ps    .3.ps    .7.ps    .8.ps
+.SUFFIXES:      .1.html  .3.html  .7.html  .8.html
+.SUFFIXES:      .1.xhtml .3.xhtml .7.xhtml .8.xhtml
 
 # Specify this if you want to hard-code the operating system to appear
 # in the lower-left hand corner of -mdoc manuals.
 # CFLAGS       += -DOSNAME="\"OpenBSD 4.5\""
 
-VERSION                 = 1.11.2
-VDATE           = 12 May 2011
+VERSION                 = 1.11.4
+VDATE           = 12 July 2011
 # IFF your system supports multi-byte functions (setlocale(), wcwidth(),
 # putwchar()) AND has __STDC_ISO_10646__ (that is, wchar_t is simply a
 # UCS-4 value) should you define USE_WCHAR.  If you define it and your
@@ -30,8 +30,12 @@ INSTALL               = install
 INSTALL_PROGRAM         = $(INSTALL) -m 0755
 INSTALL_DATA    = $(INSTALL) -m 0444
 INSTALL_LIB     = $(INSTALL) -m 0644
+INSTALL_SOURCE  = $(INSTALL) -m 0644
 INSTALL_MAN     = $(INSTALL_DATA)
 
+# Linux needs -ldb to compile mandocdb.
+#DBLIB          = -ldb
+
 all: mandoc preconv
 
 SRCS            = Makefile \
@@ -72,8 +76,8 @@ SRCS           = Makefile \
                   mandoc.3 \
                   mandoc.c \
                   mandoc.h \
-                  makewhatis.1 \
-                  makewhatis.c \
+                  mandocdb.8 \
+                  mandocdb.c \
                   mandoc_char.7 \
                   mdoc.h \
                   mdoc.7 \
@@ -108,6 +112,7 @@ SRCS                 = Makefile \
                   term.h \
                   term_ascii.c \
                   term_ps.c \
+                  test-mmap.c \
                   test-strlcat.c \
                   test-strlcpy.c \
                   tree.c \
@@ -225,22 +230,17 @@ $(MANDOC_OBJS) $(MANDOC_LNS): main.h mandoc.h mdoc.h man.h config.h out.h
 
 compat.o compat.ln: config.h
 
-MAKEWHATIS_OBJS         = makewhatis.o
-MAKEWHATIS_LNS  = makewhatis.ln
+MANDOCDB_OBJS   = mandocdb.o
+MANDOCDB_LNS    = mandocdb.ln
 
-$(MAKEWHATIS_OBJS) $(MAKEWHATIS_LNS): mandoc.h mdoc.h man.h config.h
+$(MANDOCDB_OBJS) $(MANDOCDB_LNS): mandoc.h mdoc.h man.h config.h
 
 PRECONV_OBJS    = preconv.o
 PRECONV_LNS     = preconv.ln
 
 $(PRECONV_OBJS) $(PRECONV_LNS): config.h
 
-INDEX_MANS      = makewhatis.1.html \
-                  makewhatis.1.xhtml \
-                  makewhatis.1.ps \
-                  makewhatis.1.pdf \
-                  makewhatis.1.txt \
-                  mandoc.1.html \
+INDEX_MANS      = mandoc.1.html \
                   mandoc.1.xhtml \
                   mandoc.1.ps \
                   mandoc.1.pdf \
@@ -284,7 +284,12 @@ INDEX_MANS  = makewhatis.1.html \
                   tbl.7.xhtml \
                   tbl.7.ps \
                   tbl.7.pdf \
-                  tbl.7.txt
+                  tbl.7.txt \
+                  mandocdb.8.html \
+                  mandocdb.8.xhtml \
+                  mandocdb.8.ps \
+                  mandocdb.8.pdf \
+                  mandocdb.8.txt
 
 $(INDEX_MANS): mandoc
 
@@ -297,13 +302,13 @@ INDEX_OBJS         = $(INDEX_MANS) \
 
 www: index.html
 
-lint: llib-llibmandoc.ln llib-lmandoc.ln
+lint: llib-llibmandoc.ln llib-lmandoc.ln llib-lpreconv.ln
 
 clean:
        rm -f libmandoc.a $(LIBMANDOC_OBJS)
        rm -f llib-llibmandoc.ln $(LIBMANDOC_LNS)
-       rm -f makewhatis $(MAKEWHATIS_OBJS)
-       rm -f llib-lmakewhatis.ln $(MAKEWHATIS_LNS)
+       rm -f mandocdb $(MANDOCDB_OBJS)
+       rm -f llib-lmandocdb.ln $(MANDOCDB_LNS)
        rm -f preconv $(PRECONV_OBJS)
        rm -f llib-lpreconv.ln $(PRECONV_LNS)
        rm -f mandoc $(MANDOC_OBJS)
@@ -320,9 +325,10 @@ install: all
        mkdir -p $(DESTDIR)$(MANDIR)/man1
        mkdir -p $(DESTDIR)$(MANDIR)/man3
        mkdir -p $(DESTDIR)$(MANDIR)/man7
+       mkdir -p $(DESTDIR)$(MANDIR)/man8
        $(INSTALL_PROGRAM) mandoc preconv $(DESTDIR)$(BINDIR)
        $(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)
-       $(INSTALL_LIB) mandoc.h $(DESTDIR)$(INCLUDEDIR)
+       $(INSTALL_LIB) man.h mdoc.h mandoc.h $(DESTDIR)$(INCLUDEDIR)
        $(INSTALL_MAN) mandoc.1 preconv.1 $(DESTDIR)$(MANDIR)/man1
        $(INSTALL_MAN) mandoc.3 $(DESTDIR)$(MANDIR)/man3
        $(INSTALL_MAN) man.7 mdoc.7 roff.7 eqn.7 tbl.7 mandoc_char.7 $(DESTDIR)$(MANDIR)/man7
@@ -350,12 +356,11 @@ mandoc: $(MANDOC_OBJS) libmandoc.a
 llib-lmandoc.ln: $(MANDOC_LNS)
        $(LINT) $(LINTFLAGS) -Cmandoc $(MANDOC_LNS)
 
-# You'll need -ldb for Linux.
-makewhatis: $(MAKEWHATIS_OBJS) libmandoc.a
-       $(CC) -o $@ $(MAKEWHATIS_OBJS) libmandoc.a
+mandocdb: $(MANDOCDB_OBJS) libmandoc.a
+       $(CC) -o $@ $(MANDOCDB_OBJS) libmandoc.a $(DBLIB)
 
-llib-lmakewhatis.ln: $(MAKEWHATIS_LNS)
-       $(LINT) $(LINTFLAGS) -Cmakewhatis $(MAKEWHATIS_LNS)
+llib-lmandocdb.ln: $(MANDOCDB_LNS)
+       $(LINT) $(LINTFLAGS) -Cmandocdb $(MANDOCDB_LNS)
 
 preconv: $(PRECONV_OBJS)
        $(CC) -o $@ $(PRECONV_OBJS)
@@ -368,7 +373,7 @@ mdocml.md5: mdocml.tar.gz
 
 mdocml.tar.gz: $(SRCS)
        mkdir -p .dist/mdocml-$(VERSION)/
-       $(INSTALL) -m 0444 $(SRCS) .dist/mdocml-$(VERSION)
+       $(INSTALL_SOURCE) $(SRCS) .dist/mdocml-$(VERSION)
        ( cd .dist/ && tar zcf ../$@ ./ )
        rm -rf .dist/
 
@@ -382,6 +387,10 @@ config.h: config.h.pre config.h.post
                echo '#define HAVE_STRLCAT'; \
                rm test-strlcat; \
          fi; \
+         if $(CC) $(CFLAGS) -Werror -o test-mmap test-mmap.c >> config.log 2>&1; then \
+               echo '#define HAVE_MMAP'; \
+               rm test-mmap; \
+         fi; \
          if $(CC) $(CFLAGS) -Werror -o test-strlcpy test-strlcpy.c >> config.log 2>&1; then \
                echo '#define HAVE_STRLCPY'; \
                rm test-strlcpy; \
@@ -393,19 +402,19 @@ config.h: config.h.pre config.h.post
 .h.h.html:
        highlight -I $< >$@
 
-.1.1.txt .3.3.txt .7.7.txt:
+.1.1.txt .3.3.txt .7.7.txt .8.8.txt:
        ./mandoc -Tascii -Wall,stop $< | col -b >$@
 
-.1.1.html .3.3.html .7.7.html:
+.1.1.html .3.3.html .7.7.html .8.8.html:
        ./mandoc -Thtml -Wall,stop -Ostyle=style.css,man=%N.%S.html,includes=%I.html $< >$@
 
-.1.1.ps .3.3.ps .7.7.ps:
+.1.1.ps .3.3.ps .7.7.ps .8.8.ps:
        ./mandoc -Tps -Wall,stop $< >$@
 
-.1.1.xhtml .3.3.xhtml .7.7.xhtml:
+.1.1.xhtml .3.3.xhtml .7.7.xhtml .8.8.xhtml:
        ./mandoc -Txhtml -Wall,stop -Ostyle=style.css,man=%N.%S.xhtml,includes=%I.html $< >$@
 
-.1.1.pdf .3.3.pdf .7.7.pdf:
+.1.1.pdf .3.3.pdf .7.7.pdf .8.8.pdf:
        ./mandoc -Tpdf -Wall,stop $< >$@
 
 .sgml.html: