Rename makewhatis [back] into mandocdb. This is to maintain consistency

[mandoc.git] / Makefile

diff --git a/Makefile b/Makefile
index efc8987539b6e91be1d358a42bf2326eeedf97a2..cc3e7a1613a72e090dd3d4d38f3dc4b893093abd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,8 +11,8 @@
 # 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,9 +30,10 @@ 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)
 
-all: mandoc
+all: mandoc preconv
 
 SRCS            = Makefile \
                   arch.c \
@@ -72,8 +73,8 @@ SRCS           = Makefile \
                   mandoc.3 \
                   mandoc.c \
                   mandoc.h \
-                  makewhatis.1 \
-                  makewhatis.c \
+                  mandocdb.1 \
+                  mandocdb.c \
                   mandoc_char.7 \
                   mdoc.h \
                   mdoc.7 \
@@ -88,6 +89,9 @@ SRCS           = Makefile \
                   msec.in \
                   out.c \
                   out.h \
+                  preconv.1 \
+                  preconv.c \
+                  predefs.in \
                   read.c \
                   roff.7 \
                   roff.c \
@@ -105,6 +109,7 @@ SRCS                 = Makefile \
                   term.h \
                   term_ascii.c \
                   term_ps.c \
+                  test-mmap.c \
                   test-strlcat.c \
                   test-strlcpy.c \
                   tree.c \
@@ -174,6 +179,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
+roff.o roff.ln: predefs.in
 st.o st.ln: st.in
 vol.o vol.ln: vol.in
 
@@ -221,16 +227,21 @@ $(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
 
-INDEX_MANS      = makewhatis.1.html \
-                  makewhatis.1.xhtml \
-                  makewhatis.1.ps \
-                  makewhatis.1.pdf \
-                  makewhatis.1.txt \
+PRECONV_OBJS    = preconv.o
+PRECONV_LNS     = preconv.ln
+
+$(PRECONV_OBJS) $(PRECONV_LNS): config.h
+
+INDEX_MANS      = mandocdb.1.html \
+                  mandocdb.1.xhtml \
+                  mandocdb.1.ps \
+                  mandocdb.1.pdf \
+                  mandocdb.1.txt \
                   mandoc.1.html \
                   mandoc.1.xhtml \
                   mandoc.1.ps \
@@ -261,6 +272,11 @@ INDEX_MANS  = makewhatis.1.html \
                   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 \
@@ -283,13 +299,15 @@ 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)
        rm -f llib-lmandoc.ln $(MANDOC_LNS)
        rm -f config.h config.log compat.o compat.ln
@@ -304,10 +322,10 @@ install: all
        mkdir -p $(DESTDIR)$(MANDIR)/man1
        mkdir -p $(DESTDIR)$(MANDIR)/man3
        mkdir -p $(DESTDIR)$(MANDIR)/man7
-       $(INSTALL_PROGRAM) mandoc $(DESTDIR)$(BINDIR)
+       $(INSTALL_PROGRAM) mandoc preconv $(DESTDIR)$(BINDIR)
        $(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)
@@ -331,22 +349,28 @@ llib-llibmandoc.ln: compat.ln $(LIBMANDOC_LNS)
 mandoc: $(MANDOC_OBJS) libmandoc.a
        $(CC) -o $@ $(MANDOC_OBJS) libmandoc.a
 
-# You'll need -ldb for Linux.
-makewhatis: $(MAKEWHATIS_OBJS) libmandoc.a
-       $(CC) -o $@ $(MAKEWHATIS_OBJS) libmandoc.a
-
 llib-lmandoc.ln: $(MANDOC_LNS)
        $(LINT) $(LINTFLAGS) -Cmandoc $(MANDOC_LNS)
 
-llib-lmakewhatis.ln: $(MAKEWHATIS_LNS)
-       $(LINT) $(LINTFLAGS) -Cmakewhatis $(MAKEWHATIS_LNS)
+# You'll need -ldb for Linux.
+mandocdb: $(MANDOCDB_OBJS) libmandoc.a
+       $(CC) -o $@ $(MANDOCDB_OBJS) libmandoc.a
+
+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)/
-       $(INSTALL) -m 0444 $(SRCS) .dist/mdocml-$(VERSION)
+       $(INSTALL_SOURCE) $(SRCS) .dist/mdocml-$(VERSION)
        ( cd .dist/ && tar zcf ../$@ ./ )
        rm -rf .dist/
 
@@ -360,6 +384,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; \