Check for and throw away `gfont' eqn macros.

[mandoc.git] / Makefile

diff --git a/Makefile b/Makefile
index a46818d987e95e03c04c3a8da6aa18cb00350f37..03d00fdd792c255e09f56501354cfd8b97157ab6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,24 @@
 .PHONY:         clean install installwww
 .SUFFIXES:      .sgml .html .md5 .h .h.html
 .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\""
 
 
 # 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.1
-VDATE           = 04 April 2011
-CFLAGS         += -g -DHAVE_CONFIG_H -DVERSION="\"$(VERSION)\""
+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
+# system DOESN'T support this, -Tlocale will produce garbage.
+# If you don't define it, -Tlocale is a synonym for -Tacsii.
+CFLAGS         += -g -DUSE_WCHAR -DHAVE_CONFIG_H -DVERSION="\"$(VERSION)\""

 CFLAGS         += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
 PREFIX          = /usr/local
 BINDIR          = $(PREFIX)/bin
 CFLAGS         += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
 PREFIX          = /usr/local
 BINDIR          = $(PREFIX)/bin


@@ -25,9 +30,13 @@ INSTALL               = install
 INSTALL_PROGRAM         = $(INSTALL) -m 0755
 INSTALL_DATA    = $(INSTALL) -m 0444
 INSTALL_LIB     = $(INSTALL) -m 0644
 INSTALL_PROGRAM         = $(INSTALL) -m 0755
 INSTALL_DATA    = $(INSTALL) -m 0444
 INSTALL_LIB     = $(INSTALL) -m 0644

+INSTALL_SOURCE  = $(INSTALL) -m 0644

 INSTALL_MAN     = $(INSTALL_DATA)
 
 INSTALL_MAN     = $(INSTALL_DATA)
 

-all: mandoc
+# Linux needs -ldb to compile mandocdb.
+#DBLIB          = -ldb
+
+all: mandoc preconv

 
 SRCS            = Makefile \
                   arch.c \
 
 SRCS            = Makefile \
                   arch.c \


@@ -41,6 +50,7 @@ SRCS           = Makefile \
                   config.h.pre \
                   eqn.7 \
                   eqn.c \
                   config.h.pre \
                   eqn.7 \
                   eqn.c \

+                  eqn_term.c \

                   example.style.css \
                   external.png \
                   html.c \
                   example.style.css \
                   external.png \
                   html.c \


@@ -67,8 +77,8 @@ SRCS           = Makefile \
                   mandoc.3 \
                   mandoc.c \
                   mandoc.h \
                   mandoc.3 \
                   mandoc.c \
                   mandoc.h \

-                  mandoc-db.1 \
-                  mandoc-db.c \
+                  mandocdb.8 \
+                  mandocdb.c \

                   mandoc_char.7 \
                   mdoc.h \
                   mdoc.7 \
                   mandoc_char.7 \
                   mdoc.h \
                   mdoc.7 \


@@ -83,6 +93,9 @@ SRCS           = Makefile \
                   msec.in \
                   out.c \
                   out.h \
                   msec.in \
                   out.c \
                   out.h \

+                  preconv.1 \
+                  preconv.c \
+                  predefs.in \

                   read.c \
                   roff.7 \
                   roff.c \
                   read.c \
                   roff.7 \
                   roff.c \


@@ -100,6 +113,7 @@ SRCS                 = Makefile \
                   term.h \
                   term_ascii.c \
                   term_ps.c \
                   term.h \
                   term_ascii.c \
                   term_ps.c \

+                  test-mmap.c \

                   test-strlcat.c \
                   test-strlcpy.c \
                   tree.c \
                   test-strlcat.c \
                   test-strlcpy.c \
                   tree.c \


@@ -169,6 +183,7 @@ att.o att.ln: att.in
 chars.o chars.ln: chars.in
 lib.o lib.ln: lib.in
 msec.o msec.ln: msec.in
 chars.o chars.ln: chars.in
 lib.o lib.ln: lib.in
 msec.o msec.ln: msec.in

+roff.o roff.ln: predefs.in

 st.o st.ln: st.in
 vol.o vol.ln: vol.in
 
 st.o st.ln: st.in
 vol.o vol.ln: vol.in
 


@@ -186,13 +201,15 @@ MANDOC_HTML_LNS    = html.ln \
                   mdoc_html.ln \
                   tbl_html.ln
 
                   mdoc_html.ln \
                   tbl_html.ln
 

-MANDOC_TERM_OBJS = man_term.o \
+MANDOC_TERM_OBJS = eqn_term.o \
+                  man_term.o \

                   mdoc_term.o \
                   term.o \
                   term_ascii.o \
                   term_ps.o \
                   tbl_term.o
                   mdoc_term.o \
                   term.o \
                   term_ascii.o \
                   term_ps.o \
                   tbl_term.o

-MANDOC_TERM_LNS         = man_term.ln \
+MANDOC_TERM_LNS         = eqn_term.ln \
+                  man_term.ln \

                   mdoc_term.ln \
                   term.ln \
                   term_ascii.ln \
                   mdoc_term.ln \
                   term.ln \
                   term_ascii.ln \


@@ -216,11 +233,16 @@ $(MANDOC_OBJS) $(MANDOC_LNS): main.h mandoc.h mdoc.h man.h config.h out.h
 
 compat.o compat.ln: config.h
 
 
 compat.o compat.ln: config.h
 

-MANDOCDB_OBJS   = mandoc-db.o
-MANDOCDB_LNS    = mandoc-db.ln
+MANDOCDB_OBJS   = mandocdb.o
+MANDOCDB_LNS    = mandocdb.ln

 
 $(MANDOCDB_OBJS) $(MANDOCDB_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      = mandoc.1.html \
                   mandoc.1.xhtml \
                   mandoc.1.ps \
 INDEX_MANS      = mandoc.1.html \
                   mandoc.1.xhtml \
                   mandoc.1.ps \


@@ -251,6 +273,11 @@ INDEX_MANS  = mandoc.1.html \
                   mdoc.7.ps \
                   mdoc.7.pdf \
                   mdoc.7.txt \
                   mdoc.7.ps \
                   mdoc.7.pdf \
                   mdoc.7.txt \

+                  preconv.1.html \
+                  preconv.1.xhtml \
+                  preconv.1.ps \
+                  preconv.1.pdf \
+                  preconv.1.txt \

                   roff.7.html \
                   roff.7.xhtml \
                   roff.7.ps \
                   roff.7.html \
                   roff.7.xhtml \
                   roff.7.ps \


@@ -260,7 +287,12 @@ INDEX_MANS  = mandoc.1.html \
                   tbl.7.xhtml \
                   tbl.7.ps \
                   tbl.7.pdf \
                   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
 
 
 $(INDEX_MANS): mandoc
 


@@ -273,13 +305,15 @@ INDEX_OBJS         = $(INDEX_MANS) \
 
 www: index.html
 
 
 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)
 
 clean:
        rm -f libmandoc.a $(LIBMANDOC_OBJS)
        rm -f llib-llibmandoc.ln $(LIBMANDOC_LNS)

-       rm -f mandoc-db $(MANDOCDB_OBJS)
-       rm -f llib-lmandoc-db.ln $(MANDOCDB_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)
        rm -f llib-lmandoc.ln $(MANDOC_LNS)
        rm -f config.h config.log compat.o compat.ln
        rm -f mandoc $(MANDOC_OBJS)
        rm -f llib-lmandoc.ln $(MANDOC_LNS)
        rm -f config.h config.log compat.o compat.ln


@@ -294,10 +328,11 @@ install: all
        mkdir -p $(DESTDIR)$(MANDIR)/man1
        mkdir -p $(DESTDIR)$(MANDIR)/man3
        mkdir -p $(DESTDIR)$(MANDIR)/man7
        mkdir -p $(DESTDIR)$(MANDIR)/man1
        mkdir -p $(DESTDIR)$(MANDIR)/man3
        mkdir -p $(DESTDIR)$(MANDIR)/man7

-       $(INSTALL_PROGRAM) mandoc $(DESTDIR)$(BINDIR)
+       mkdir -p $(DESTDIR)$(MANDIR)/man8
+       $(INSTALL_PROGRAM) mandoc preconv $(DESTDIR)$(BINDIR)

        $(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)
        $(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)

-       $(INSTALL_LIB) mandoc.h $(DESTDIR)$(INCLUDEDIR)
-       $(INSTALL_MAN) mandoc.1 $(DESTDIR)$(MANDIR)/man1
+       $(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
        $(INSTALL_DATA) example.style.css $(DESTDIR)$(EXAMPLEDIR)
        $(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
        $(INSTALL_DATA) example.style.css $(DESTDIR)$(EXAMPLEDIR)


@@ -321,22 +356,27 @@ llib-llibmandoc.ln: compat.ln $(LIBMANDOC_LNS)
 mandoc: $(MANDOC_OBJS) libmandoc.a
        $(CC) -o $@ $(MANDOC_OBJS) libmandoc.a
 
 mandoc: $(MANDOC_OBJS) libmandoc.a
        $(CC) -o $@ $(MANDOC_OBJS) libmandoc.a
 

-# You'll need -ldb for Linux.
-mandoc-db: $(MANDOCDB_OBJS) libmandoc.a
-       $(CC) -o $@ $(MANDOCDB_OBJS) libmandoc.a
-

 llib-lmandoc.ln: $(MANDOC_LNS)
        $(LINT) $(LINTFLAGS) -Cmandoc $(MANDOC_LNS)
 
 llib-lmandoc.ln: $(MANDOC_LNS)
        $(LINT) $(LINTFLAGS) -Cmandoc $(MANDOC_LNS)
 

-llib-lmandoc-db.ln: $(MANDOCDB_LNS)
-       $(LINT) $(LINTFLAGS) -Cmandoc-db $(MANDOCDB_LNS)
+mandocdb: $(MANDOCDB_OBJS) libmandoc.a
+       $(CC) -o $@ $(MANDOCDB_OBJS) libmandoc.a $(DBLIB)
+
+llib-lmandocdb.ln: $(MANDOCDB_LNS)
+       $(LINT) $(LINTFLAGS) -Cmandocdb $(MANDOCDB_LNS)
+
+preconv: $(PRECONV_OBJS)
+       $(CC) -o $@ $(PRECONV_OBJS)
+
+llib-lpreconv.ln: $(PRECONV_LNS)
+       $(LINT) $(LINTFLAGS) -Cpreconv $(PRECONV_LNS)

 
 mdocml.md5: mdocml.tar.gz
        md5 mdocml.tar.gz >$@
 
 mdocml.tar.gz: $(SRCS)
        mkdir -p .dist/mdocml-$(VERSION)/
 
 mdocml.md5: mdocml.tar.gz
        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/
 
        ( cd .dist/ && tar zcf ../$@ ./ )
        rm -rf .dist/
 


@@ -350,6 +390,10 @@ config.h: config.h.pre config.h.post
                echo '#define HAVE_STRLCAT'; \
                rm test-strlcat; \
          fi; \
                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; \
          if $(CC) $(CFLAGS) -Werror -o test-strlcpy test-strlcpy.c >> config.log 2>&1; then \
                echo '#define HAVE_STRLCPY'; \
                rm test-strlcpy; \


@@ -361,19 +405,19 @@ config.h: config.h.pre config.h.post
 .h.h.html:
        highlight -I $< >$@
 
 .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 >$@
 
        ./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 $< >$@
 
        ./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 $< >$@
 
        ./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 $< >$@
 
        ./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:
        ./mandoc -Tpdf -Wall,stop $< >$@
 
 .sgml.html: