===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.322
retrieving revision 1.331
diff -u -p -r1.322 -r1.331
--- mandoc/Makefile	2011/03/23 12:32:39	1.322
+++ mandoc/Makefile	2011/04/04 22:05:28	1.331
@@ -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.1
+VDATE		 = 04 April 2011
 CFLAGS		+= -g -DHAVE_CONFIG_H -DVERSION="\"$(VERSION)\""
 CFLAGS     	+= -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
 PREFIX		 = /usr/local
@@ -55,9 +55,9 @@ SRCS		 = Makefile \
 		   libroff.h \
 		   main.c \
 		   main.h \
+		   man.h \
 		   man.7 \
 		   man.c \
-		   man_argv.c \
 		   man_hash.c \
 		   man_html.c \
 		   man_macro.c \
@@ -67,7 +67,10 @@ SRCS		 = Makefile \
 		   mandoc.3 \
 		   mandoc.c \
 		   mandoc.h \
+		   mandoc-db.1 \
+		   mandoc-db.c \
 		   mandoc_char.7 \
+		   mdoc.h \
 		   mdoc.7 \
 		   mdoc.c \
 		   mdoc_argv.c \
@@ -104,10 +107,14 @@ SRCS		 = Makefile \
 		   vol.in
 
 LIBMAN_OBJS	 = man.o \
-		   man_argv.o \
 		   man_hash.o \
 		   man_macro.o \
 		   man_validate.o
+LIBMAN_LNS	 = man.ln \
+		   man_hash.ln \
+		   man_macro.ln \
+		   man_validate.ln
+
 LIBMDOC_OBJS	 = arch.o \
 		   att.o \
 		   lib.o \
@@ -119,55 +126,102 @@ LIBMDOC_OBJS	 = arch.o \
 		   msec.o \
 		   st.o \
 		   vol.o
+LIBMDOC_LNS	 = arch.ln \
+		   att.ln \
+		   lib.ln \
+		   mdoc.ln \
+		   mdoc_argv.ln \
+		   mdoc_hash.ln \
+		   mdoc_macro.ln \
+		   mdoc_validate.ln \
+		   msec.ln \
+		   st.ln \
+		   vol.ln
+
 LIBROFF_OBJS	 = eqn.o \
 		   roff.o \
 		   tbl.o \
 		   tbl_data.o \
 		   tbl_layout.o \
 		   tbl_opts.o
+LIBROFF_LNS	 = eqn.ln \
+		   roff.ln \
+		   tbl.ln \
+		   tbl_data.ln \
+		   tbl_layout.ln \
+		   tbl_opts.ln
+
 LIBMANDOC_OBJS	 = $(LIBMAN_OBJS) \
 		   $(LIBMDOC_OBJS) \
 		   $(LIBROFF_OBJS) \
 		   mandoc.o \
 		   read.o
+LIBMANDOC_LNS	 = $(LIBMAN_LNS) \
+		   $(LIBMDOC_LNS) \
+		   $(LIBROFF_LNS) \
+		   mandoc.ln \
+		   read.ln
 
-arch.o: arch.in
-att.o: att.in
-lib.o: lib.in
-msec.o: msec.in
-st.o: st.in
-vol.o: vol.in
+arch.o arch.ln: arch.in
+att.o att.ln: att.in
+lib.o lib.ln: lib.in
+msec.o msec.ln: msec.in
+st.o st.ln: st.in
+vol.o vol.ln: vol.in
 
-$(LIBMAN_OBJS): libman.h
-$(LIBMDOC_OBJS): libmdoc.h
-$(LIBROFF_OBJS): libroff.h
-$(LIBMANDOC_OBJS): mandoc.h mdoc.h man.h libmandoc.h config.h
+$(LIBMAN_OBJS) $(LIBMAN_LNS): libman.h
+$(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 \
 		   man_html.o \
 		   mdoc_html.o \
 		   tbl_html.o
+MANDOC_HTML_LNS	 = html.ln \
+		   man_html.ln \
+		   mdoc_html.ln \
+		   tbl_html.ln
+
 MANDOC_TERM_OBJS = man_term.o \
 		   mdoc_term.o \
 		   term.o \
 		   term_ascii.o \
 		   term_ps.o \
 		   tbl_term.o
+MANDOC_TERM_LNS	 = man_term.ln \
+		   mdoc_term.ln \
+		   term.ln \
+		   term_ascii.ln \
+		   term_ps.ln \
+		   tbl_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.in
+chars.o chars.ln: chars.in
 
-$(MANDOC_HTML_OBJS): html.h
-$(MANDOC_TERM_OBJS): term.h
-$(MANDOC_OBJS): main.h mandoc.h mdoc.h man.h config.h out.h
+$(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: config.h
+compat.o compat.ln: config.h
 
+MANDOCDB_OBJS	 = mandoc-db.o
+MANDOCDB_LNS	 = mandoc-db.ln
+
+$(MANDOCDB_OBJS) $(MANDOCDB_LNS): mandoc.h mdoc.h man.h config.h
+
 INDEX_MANS	 = mandoc.1.html \
 		   mandoc.1.xhtml \
 		   mandoc.1.ps \
@@ -220,10 +274,16 @@ INDEX_OBJS	 = $(INDEX_MANS) \
 
 www: index.html
 
+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 mandoc $(MANDOC_OBJS)
-	rm -f config.h compat.o config.log
+	rm -f llib-lmandoc.ln $(MANDOC_LNS)
+	rm -f config.h config.log compat.o compat.ln
 	rm -f mdocml.tar.gz
 	rm -f index.html $(INDEX_OBJS)
 
@@ -234,7 +294,7 @@ install: all
 	mkdir -p $(DESTDIR)$(MANDIR)/man3
 	mkdir -p $(DESTDIR)$(MANDIR)/man7
 	$(INSTALL_PROGRAM) mandoc $(DESTDIR)$(BINDIR)
-	$(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)/
+	$(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)
 	$(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
@@ -253,8 +313,21 @@ installwww: www
 libmandoc.a: compat.o $(LIBMANDOC_OBJS)
 	$(AR) rs $@ compat.o $(LIBMANDOC_OBJS)
 
+llib-llibmandoc.ln: compat.ln $(LIBMANDOC_LNS)
+	$(LINT) $(LINTFLAGS) -Clibmandoc compat.ln $(LIBMANDOC_LNS)
+
 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-db.ln: $(MANDOCDB_LNS)
+	$(LINT) $(LINTFLAGS) -Cmandoc-db $(MANDOCDB_LNS)
 
 mdocml.md5: mdocml.tar.gz
 	md5 mdocml.tar.gz >$@