===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.409
retrieving revision 1.415
diff -u -p -r1.409 -r1.415
--- mandoc/Makefile	2014/01/04 14:45:54	1.409
+++ mandoc/Makefile	2014/04/15 20:18:26	1.415
@@ -1,16 +1,17 @@
-.PHONY: 	 clean install installwww
-.SUFFIXES:	 .sgml .html .md5 .h .h.html
-.SUFFIXES:	 .1       .3       .7       .8
-.SUFFIXES:	 .1.html  .3.html  .7.html  .8.html
+.PHONY: 	 clean install installcgi installwww
+.SUFFIXES:	 .md5 .h .h.html
+.SUFFIXES:	 .1       .3       .5       .7       .8
+.SUFFIXES:	 .1.html  .3.html  .5.html  .7.html  .8.html
 
+VERSION		 = 1.13.0
+
+# === USER SETTINGS ====================================================
+
 # 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 5.4\""
 
-VERSION		 = 1.12.3
-VDATE		 = 31 December 2013
-
 # 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
@@ -48,11 +49,17 @@ INSTALL_LIB	 = $(INSTALL) -m 0644
 INSTALL_SOURCE	 = $(INSTALL) -m 0644
 INSTALL_MAN	 = $(INSTALL_DATA)
 
+# If you want to build without database support, for example to avoid
+# the dependency on SQLite3, comment the following two lines.
 DBLIB		 = -L/usr/local/lib -lsqlite3
 DBBIN		 = mandocdb manpage apropos
 
-all: mandoc preconv demandoc $(DBBIN)
+# === END OF USER SETTINGS =============================================
 
+ALLBIN		 = mandoc preconv demandoc $(DBBIN)
+
+all: $(ALLBIN)
+
 TESTSRCS	 = test-fgetln.c \
 		   test-getsubopt.c \
 		   test-mmap.c \
@@ -76,6 +83,8 @@ SRCS		 = Makefile \
 		   chars.in \
 		   compat_fgetln.c \
 		   compat_getsubopt.c \
+		   compat_ohash.c \
+		   compat_ohash.h \
 		   compat_strcasestr.c \
 		   compat_strlcat.c \
 		   compat_strlcpy.c \
@@ -91,12 +100,9 @@ SRCS		 = Makefile \
 		   eqn_html.c \
 		   eqn_term.c \
 		   example.style.css \
-		   external.png \
 		   gmdiff \
 		   html.c \
 		   html.h \
-		   index.css \
-		   index.sgml \
 		   lib.c \
 		   lib.in \
 		   libman.h \
@@ -117,12 +123,20 @@ SRCS		 = Makefile \
 		   mandoc.1 \
 		   mandoc.3 \
 		   mandoc.c \
+		   mandoc.db.5 \
 		   mandoc.h \
+		   mandoc_aux.c \
+		   mandoc_aux.h \
 		   mandoc_char.7 \
 		   mandocdb.8 \
 		   mandocdb.c \
+		   manpage.c \
 		   manpath.c \
 		   manpath.h \
+		   mansearch.3 \
+		   mansearch.c \
+		   mansearch.h \
+		   mansearch_const.c \
 		   mdoc.7 \
 		   mdoc.c \
 		   mdoc.h \
@@ -191,6 +205,7 @@ LIBMANDOC_OBJS	 = $(LIBMAN_OBJS) \
 		   $(LIBROFF_OBJS) \
 		   chars.o \
 		   mandoc.o \
+		   mandoc_aux.o \
 		   msec.o \
 		   read.o
 
@@ -215,7 +230,7 @@ vol.o: 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
+$(LIBMANDOC_OBJS): mandoc.h mandoc_aux.h mdoc.h man.h libmandoc.h config.h
 $(COMPAT_OBJS): config.h compat_ohash.h
 
 MANDOC_HTML_OBJS = eqn_html.o \
@@ -242,48 +257,50 @@ MANDOC_OBJS	 = $(MANDOC_HTML_OBJS) \
 		   main.o \
 		   out.o \
 		   tree.o
-$(MANDOC_OBJS): main.h mandoc.h mdoc.h man.h config.h out.h
+$(MANDOC_OBJS): main.h mandoc.h mandoc_aux.h mdoc.h man.h config.h out.h
 
-MANDOCDB_OBJS	 = mandocdb.o manpath.o
-$(MANDOCDB_OBJS): mansearch.h mandoc.h mdoc.h man.h config.h manpath.h
+MANDOCDB_OBJS	 = mandocdb.o mansearch_const.o manpath.o
+$(MANDOCDB_OBJS): mansearch.h mandoc.h mandoc_aux.h \
+		  mdoc.h man.h config.h manpath.h
 
 PRECONV_OBJS	 = preconv.o
 $(PRECONV_OBJS): config.h
 
-APROPOS_OBJS	 = apropos.o mansearch.o manpath.o
+APROPOS_OBJS	 = apropos.o mansearch.o mansearch_const.o manpath.o
 $(APROPOS_OBJS): config.h manpath.h mansearch.h
 
-MANPAGE_OBJS	 = manpage.o mansearch.o manpath.o
+MANPAGE_OBJS	 = manpage.o mansearch.o mansearch_const.o manpath.o
 $(MANPAGE_OBJS): config.h manpath.h mansearch.h
 
 DEMANDOC_OBJS	 = demandoc.o
 $(DEMANDOC_OBJS): config.h
 
-INDEX_MANS	 = apropos.1.html \
+WWW_MANS	 = apropos.1.html \
 		   demandoc.1.html \
 		   mandoc.1.html \
 		   preconv.1.html \
 		   mandoc.3.html \
+		   mansearch.3.html \
 		   tbl.3.html \
+		   mandoc.db.5.html \
 		   eqn.7.html \
 		   man.7.html \
 		   mandoc_char.7.html \
 		   mdoc.7.html \
 		   roff.7.html \
 		   tbl.7.html \
-		   mandocdb.8.html
-
-$(INDEX_MANS): mandoc
-
-INDEX_OBJS	 = $(INDEX_MANS) \
+		   mandocdb.8.html \
 		   man.h.html \
 		   mandoc.h.html \
-		   mdoc.h.html \
-		   mdocml.tar.gz \
-		   mdocml.md5
+		   manpath.h.html \
+		   mansearch.h.html \
+		   mdoc.h.html
 
-www: index.html
+$(WWW_MANS): mandoc
 
+WWW_OBJS	 = mdocml.tar.gz \
+		   mdocml.md5
+
 clean:
 	rm -f libmandoc.a $(LIBMANDOC_OBJS)
 	rm -f apropos $(APROPOS_OBJS)
@@ -293,8 +310,7 @@ clean:
 	rm -f demandoc $(DEMANDOC_OBJS)
 	rm -f mandoc $(MANDOC_OBJS)
 	rm -f config.h config.log $(COMPAT_OBJS)
-	rm -f mdocml.tar.gz
-	rm -f index.html $(INDEX_OBJS)
+	rm -f $(WWW_MANS) $(WWW_OBJS)
 	rm -rf *.dSYM
 
 install: all
@@ -304,12 +320,14 @@ install: all
 	mkdir -p $(DESTDIR)$(INCLUDEDIR)
 	mkdir -p $(DESTDIR)$(MANDIR)/man1
 	mkdir -p $(DESTDIR)$(MANDIR)/man3
+	mkdir -p $(DESTDIR)$(MANDIR)/man5
 	mkdir -p $(DESTDIR)$(MANDIR)/man7
-	$(INSTALL_PROGRAM) mandoc preconv demandoc $(DESTDIR)$(BINDIR)
+	$(INSTALL_PROGRAM) $(ALLBIN) $(DESTDIR)$(BINDIR)
 	$(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)
 	$(INSTALL_LIB) man.h mdoc.h mandoc.h $(DESTDIR)$(INCLUDEDIR)
 	$(INSTALL_MAN) mandoc.1 preconv.1 demandoc.1 $(DESTDIR)$(MANDIR)/man1
-	$(INSTALL_MAN) mandoc.3 tbl.3 $(DESTDIR)$(MANDIR)/man3
+	$(INSTALL_MAN) mandoc.3 mansearch.3 tbl.3 $(DESTDIR)$(MANDIR)/man3
+	$(INSTALL_MAN) mandoc.db.5 $(DESTDIR)$(MANDIR)/man5
 	$(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)
 
@@ -320,16 +338,14 @@ installcgi: all
 	$(INSTALL_DATA) example.style.css $(DESTDIR)$(HTDOCDIR)/man.css
 	$(INSTALL_DATA) man-cgi.css $(DESTDIR)$(HTDOCDIR)
 
-installwww: www
-	mkdir -p $(PREFIX)/snapshots
-	mkdir -p $(PREFIX)/binaries
-	$(INSTALL_DATA) index.html external.png index.css $(PREFIX)
-	$(INSTALL_DATA) $(INDEX_MANS) style.css $(PREFIX)
-	$(INSTALL_DATA) mandoc.h.html man.h.html mdoc.h.html $(PREFIX)
-	$(INSTALL_DATA) mdocml.tar.gz $(PREFIX)/snapshots
-	$(INSTALL_DATA) mdocml.md5 $(PREFIX)/snapshots
-	$(INSTALL_DATA) mdocml.tar.gz $(PREFIX)/snapshots/mdocml-$(VERSION).tar.gz
-	$(INSTALL_DATA) mdocml.md5 $(PREFIX)/snapshots/mdocml-$(VERSION).md5
+installwww: $(WWW_MANS) $(WWW_OBJS)
+	mkdir -p $(DESTDIR)$(HTDOCDIR)/snapshots
+	$(INSTALL_DATA) $(WWW_MANS) style.css $(DESTDIR)$(HTDOCDIR)
+	$(INSTALL_DATA) $(WWW_OBJS) $(DESTDIR)$(HTDOCDIR)/snapshots
+	$(INSTALL_DATA) mdocml.tar.gz \
+		$(DESTDIR)$(HTDOCDIR)/snapshots/mdocml-$(VERSION).tar.gz
+	$(INSTALL_DATA) mdocml.md5 \
+		$(DESTDIR)$(HTDOCDIR)/snapshots/mdocml-$(VERSION).md5
 
 libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
 	$(AR) rs $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
@@ -362,8 +378,6 @@ mdocml.tar.gz: $(SRCS)
 	( cd .dist/ && tar zcf ../$@ mdocml-$(VERSION) )
 	rm -rf .dist/
 
-index.html: $(INDEX_OBJS)
-
 config.h: configure config.h.pre config.h.post $(TESTSRCS)
 	rm -f config.log
 	CC="$(CC)" CFLAGS="$(CFLAGS)" VERSION="$(VERSION)" ./configure
@@ -371,9 +385,5 @@ config.h: configure config.h.pre config.h.post $(TESTS
 .h.h.html:
 	highlight -I $< >$@
 
-.1.1.html .3.3.html .7.7.html .8.8.html:
+.1.1.html .3.3.html .5.5.html .7.7.html .8.8.html:
 	./mandoc -Thtml -Wall,stop -Ostyle=style.css,man=%N.%S.html,includes=%I.html $< >$@
-
-.sgml.html:
-	validate --warn $<
-	sed -e "s!@VERSION@!$(VERSION)!" -e "s!@VDATE@!$(VDATE)!" $< >$@