===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.357
retrieving revision 1.361
diff -u -p -r1.357 -r1.361
--- mandoc/Makefile	2011/07/17 14:11:25	1.357
+++ mandoc/Makefile	2011/07/24 10:09:03	1.361
@@ -11,8 +11,8 @@
 # in the lower-left hand corner of -mdoc manuals.
 # CFLAGS	+= -DOSNAME="\"OpenBSD 4.5\""
 
-VERSION		 = 1.11.4
-VDATE		 = 12 July 2011
+VERSION		 = 1.11.5
+VDATE		 = 24 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
@@ -33,6 +33,9 @@ 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 \
@@ -47,6 +50,8 @@ SRCS		 = Makefile \
 		   config.h.pre \
 		   eqn.7 \
 		   eqn.c \
+		   eqn_html.c \
+		   eqn_term.c \
 		   example.style.css \
 		   external.png \
 		   html.c \
@@ -188,22 +193,26 @@ $(LIBMDOC_OBJS) $(LIBMDOC_LNS): libmdoc.h
 $(LIBROFF_OBJS) $(LIBROFF_LNS): libroff.h
 $(LIBMANDOC_OBJS) $(LIBMANDOC_LNS): mandoc.h mdoc.h man.h libmandoc.h config.h
 
-MANDOC_HTML_OBJS = html.o \
+MANDOC_HTML_OBJS = eqn_html.o \
+		   html.o \
 		   man_html.o \
 		   mdoc_html.o \
 		   tbl_html.o
-MANDOC_HTML_LNS	 = html.ln \
+MANDOC_HTML_LNS	 = eqn_html.ln \
+		   html.ln \
 		   man_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
-MANDOC_TERM_LNS	 = man_term.ln \
+MANDOC_TERM_LNS	 = eqn_term.ln \
+		   man_term.ln \
 		   mdoc_term.ln \
 		   term.ln \
 		   term_ascii.ln \
@@ -353,9 +362,8 @@ mandoc: $(MANDOC_OBJS) libmandoc.a
 llib-lmandoc.ln: $(MANDOC_LNS)
 	$(LINT) $(LINTFLAGS) -Cmandoc $(MANDOC_LNS)
 
-# You'll need -ldb for Linux.
 mandocdb: $(MANDOCDB_OBJS) libmandoc.a
-	$(CC) -o $@ $(MANDOCDB_OBJS) libmandoc.a -ldb
+	$(CC) -o $@ $(MANDOCDB_OBJS) libmandoc.a $(DBLIB)
 
 llib-lmandocdb.ln: $(MANDOCDB_LNS)
 	$(LINT) $(LINTFLAGS) -Cmandocdb $(MANDOCDB_LNS)