Clean-ups in -T[x]html: inline print_num(), as it was just a single

[mandoc.git] / Makefile

diff --git a/Makefile b/Makefile
index 0055725726c532b6ca3957c90ef24d9ac4db9779..cc3fb743b6f27ee12b7413a4457692caca4574b8 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.10.10
-VDATE           = 20 March 2011
+VERSION                 = 1.11.2
+VDATE           = 12 May 2011
 CFLAGS         += -g -DHAVE_CONFIG_H -DVERSION="\"$(VERSION)\""
 CFLAGS         += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
 PREFIX          = /usr/local
@@ -55,6 +55,7 @@ SRCS           = Makefile \
                   libroff.h \
                   main.c \
                   main.h \
+                  man.h \
                   man.7 \
                   man.c \
                   man_hash.c \
@@ -66,7 +67,10 @@ SRCS          = Makefile \
                   mandoc.3 \
                   mandoc.c \
                   mandoc.h \
+                  makewhatis.1 \
+                  makewhatis.c \
                   mandoc_char.7 \
+                  mdoc.h \
                   mdoc.7 \
                   mdoc.c \
                   mdoc_argv.c \
@@ -150,16 +154,19 @@ LIBROFF_LNS        = eqn.ln \
 LIBMANDOC_OBJS  = $(LIBMAN_OBJS) \
                   $(LIBMDOC_OBJS) \
                   $(LIBROFF_OBJS) \
+                  chars.o \
                   mandoc.o \
                   read.o
 LIBMANDOC_LNS   = $(LIBMAN_LNS) \
                   $(LIBMDOC_LNS) \
                   $(LIBROFF_LNS) \
+                  chars.ln \
                   mandoc.ln \
                   read.ln
 
 arch.o arch.ln: arch.in
 att.o att.ln: att.in
+chars.o chars.ln: chars.in
 lib.o lib.ln: lib.in
 msec.o msec.ln: msec.in
 st.o st.ln: st.in
@@ -194,31 +201,32 @@ MANDOC_TERM_LNS    = man_term.ln \
 
 MANDOC_OBJS     = $(MANDOC_HTML_OBJS) \
                   $(MANDOC_TERM_OBJS) \
-                  chars.o \
                   main.o \
                   out.o \
                   tree.o
 MANDOC_LNS      = $(MANDOC_HTML_LNS) \
                   $(MANDOC_TERM_LNS) \
-                  chars.ln \
                   main.ln \
                   out.ln \
                   tree.ln
 
-chars.o chars.ln: chars.in
-
 $(MANDOC_HTML_OBJS) $(MANDOC_HTML_LNS): html.h
 $(MANDOC_TERM_OBJS) $(MANDOC_TERM_LNS): term.h
 $(MANDOC_OBJS) $(MANDOC_LNS): main.h mandoc.h mdoc.h man.h config.h out.h
 
 compat.o compat.ln: config.h
 
-MANDOCDB_OBJS   = mandoc-db.o
-MANDOCDB_LNS    = mandoc-db.ln
+MAKEWHATIS_OBJS         = makewhatis.o
+MAKEWHATIS_LNS  = makewhatis.ln
 
-$(MANDOCDB_OBJS) $(MANDOCDB_LNS): mandoc.h mdoc.h man.h config.h
+$(MAKEWHATIS_OBJS) $(MAKEWHATIS_LNS): mandoc.h mdoc.h man.h config.h
 
-INDEX_MANS      = mandoc.1.html \
+INDEX_MANS      = makewhatis.1.html \
+                  makewhatis.1.xhtml \
+                  makewhatis.1.ps \
+                  makewhatis.1.pdf \
+                  makewhatis.1.txt \
+                  mandoc.1.html \
                   mandoc.1.xhtml \
                   mandoc.1.ps \
                   mandoc.1.pdf \
@@ -275,8 +283,8 @@ lint: llib-llibmandoc.ln llib-lmandoc.ln
 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 makewhatis $(MAKEWHATIS_OBJS)
+       rm -f llib-lmakewhatis.ln $(MAKEWHATIS_LNS)
        rm -f mandoc $(MANDOC_OBJS)
        rm -f llib-lmandoc.ln $(MANDOC_LNS)
        rm -f config.h config.log compat.o compat.ln
@@ -286,11 +294,14 @@ clean:
 install: all
        mkdir -p $(DESTDIR)$(BINDIR)
        mkdir -p $(DESTDIR)$(EXAMPLEDIR)
+       mkdir -p $(DESTDIR)$(LIBDIR)
+       mkdir -p $(DESTDIR)$(INCLUDEDIR)
        mkdir -p $(DESTDIR)$(MANDIR)/man1
        mkdir -p $(DESTDIR)$(MANDIR)/man3
        mkdir -p $(DESTDIR)$(MANDIR)/man7
        $(INSTALL_PROGRAM) mandoc $(DESTDIR)$(BINDIR)
        $(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)
+       $(INSTALL_LIB) mandoc.h $(DESTDIR)$(INCLUDEDIR)
        $(INSTALL_MAN) mandoc.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
@@ -316,14 +327,14 @@ 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 -ldb
+makewhatis: $(MAKEWHATIS_OBJS) libmandoc.a
+       $(CC) -o $@ $(MAKEWHATIS_OBJS) libmandoc.a
 
 llib-lmandoc.ln: $(MANDOC_LNS)
        $(LINT) $(LINTFLAGS) -Cmandoc $(MANDOC_LNS)
 
-llib-lmandoc-db.ln: $(MANDOCDB_LNS)
-       $(LINT) $(LINTFLAGS) -Cmandoc-db $(MANDOCDB_LNS)
+llib-lmakewhatis.ln: $(MAKEWHATIS_LNS)
+       $(LINT) $(LINTFLAGS) -Cmakewhatis $(MAKEWHATIS_LNS)
 
 mdocml.md5: mdocml.tar.gz
        md5 mdocml.tar.gz >$@