===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.398
retrieving revision 1.413
diff -u -p -r1.398 -r1.413
--- mandoc/Makefile	2012/06/09 11:27:38	1.398
+++ mandoc/Makefile	2014/03/03 18:53:27	1.413
@@ -1,20 +1,17 @@
-.PHONY: 	 clean install installwww
-.SUFFIXES:	 .sgml .html .md5 .h .h.html
+.PHONY: 	 clean install installcgi installwww
+.SUFFIXES:	 .md5 .h .h.html
 .SUFFIXES:	 .1       .3       .7       .8
-.SUFFIXES:	 .1.txt   .3.txt   .7.txt   .8.txt
-.SUFFIXES:	 .1.pdf   .3.pdf   .7.pdf   .8.pdf
-.SUFFIXES:	 .1.ps    .3.ps    .7.ps    .8.ps
 .SUFFIXES:	 .1.html  .3.html  .7.html  .8.html
-.SUFFIXES:	 .1.xhtml .3.xhtml .7.xhtml .8.xhtml
 
+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 4.5\""
+# CFLAGS	+= -DOSNAME="\"OpenBSD 5.4\""
 
-VERSION		 = 1.12.1
-VDATE		 = 23 March 2012
-
 # 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
@@ -26,14 +23,15 @@ CFLAGS	 	+= -DUSE_WCHAR
 # If your system has manpath(1), uncomment this.  This is most any
 # system that's not OpenBSD or NetBSD.  If uncommented, manpage(1) and
 # mandocdb(8) will use manpath(1) to get the MANPATH variable.
-CFLAGS		+= -DUSE_MANPATH
+#CFLAGS		+= -DUSE_MANPATH
 
-# If your system supports static binaries only, uncomment this.  This
-# appears only to be BSD UNIX systems (Mac OS X has no support and Linux
-# requires -pthreads for static libdb).
+# If your system does not support static binaries, comment this,
+# for example on Mac OS X.
 STATIC		 = -static
+# Linux requires -pthread to statically link with libdb.
+#STATIC		+= -pthread
 
-CFLAGS		+= -I/usr/local/include -g -DHAVE_CONFIG_H -DVERSION="\"$(VERSION)\""
+CFLAGS		+= -I/usr/local/include -g -DHAVE_CONFIG_H
 CFLAGS     	+= -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
 PREFIX		 = /usr/local
 WWWPREFIX	 = /var/www
@@ -51,13 +49,31 @@ 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 \
+		   test-ohash.c \
+		   test-strlcat.c \
+		   test-strlcpy.c \
+		   test-strnlen.c \
+		   test-strptime.c
+
 SRCS		 = Makefile \
+		   NEWS \
 		   TODO \
+		   apropos.1 \
+		   apropos.c \
 		   arch.c \
 		   arch.in \
 		   att.c \
@@ -67,10 +83,16 @@ 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 \
+		   compat_strnlen.c \
+		   compat_strsep.c \
 		   config.h.post \
 		   config.h.pre \
+		   configure \
 		   demandoc.1 \
 		   demandoc.c \
 		   eqn.7 \
@@ -78,11 +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 \
@@ -107,9 +127,12 @@ SRCS		 = Makefile \
 		   mandoc_char.7 \
 		   mandocdb.8 \
 		   mandocdb.c \
-		   mandocdb.h \
+		   manpage.c \
 		   manpath.c \
 		   manpath.h \
+		   mansearch.c \
+		   mansearch.h \
+		   mansearch_const.c \
 		   mdoc.7 \
 		   mdoc.c \
 		   mdoc.h \
@@ -133,6 +156,7 @@ SRCS		 = Makefile \
 		   st.c \
 		   st.in \
 		   style.css \
+		   tbl.3 \
 		   tbl.7 \
 		   tbl.c \
 		   tbl_data.c \
@@ -144,16 +168,10 @@ SRCS		 = Makefile \
 		   term.h \
 		   term_ascii.c \
 		   term_ps.c \
-		   test-fgetln.c \
-		   test-getsubopt.c \
-		   test-mmap.c \
-		   test-ohash.c \
-		   test-strlcat.c \
-		   test-strlcpy.c \
-		   test-strptime.c \
 		   tree.c \
 		   vol.c \
-		   vol.in
+		   vol.in \
+		   $(TESTSRCS)
 
 LIBMAN_OBJS	 = man.o \
 		   man_hash.o \
@@ -189,8 +207,11 @@ LIBMANDOC_OBJS	 = $(LIBMAN_OBJS) \
 COMPAT_OBJS	 = compat_fgetln.o \
 		   compat_getsubopt.o \
 		   compat_ohash.o \
+		   compat_strcasestr.o \
 		   compat_strlcat.o \
-		   compat_strlcpy.o
+		   compat_strlcpy.o \
+		   compat_strnlen.o \
+		   compat_strsep.o
 
 arch.o: arch.in
 att.o: att.in
@@ -233,88 +254,43 @@ MANDOC_OBJS	 = $(MANDOC_HTML_OBJS) \
 		   tree.o
 $(MANDOC_OBJS): main.h mandoc.h mdoc.h man.h config.h out.h
 
-MANDOCDB_OBJS	 = mandocdb.o manpath.o
-$(MANDOCDB_OBJS): mandocdb.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 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): config.h manpath.h mandocdb.h mansearch.h
+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): config.h manpath.h mandocdb.h mansearch.h
+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	 = demandoc.1.html \
-		   demandoc.1.xhtml \
-		   demandoc.1.ps \
-		   demandoc.1.pdf \
-		   demandoc.1.txt \
+WWW_MANS	 = apropos.1.html \
+		   demandoc.1.html \
 		   mandoc.1.html \
-		   mandoc.1.xhtml \
-		   mandoc.1.ps \
-		   mandoc.1.pdf \
-		   mandoc.1.txt \
+		   preconv.1.html \
 		   mandoc.3.html \
-		   mandoc.3.xhtml \
-		   mandoc.3.ps \
-		   mandoc.3.pdf \
-		   mandoc.3.txt \
+		   tbl.3.html \
 		   eqn.7.html \
-		   eqn.7.xhtml \
-		   eqn.7.ps \
-		   eqn.7.pdf \
-		   eqn.7.txt \
 		   man.7.html \
-		   man.7.xhtml \
-		   man.7.ps \
-		   man.7.pdf \
-		   man.7.txt \
 		   mandoc_char.7.html \
-		   mandoc_char.7.xhtml \
-		   mandoc_char.7.ps \
-		   mandoc_char.7.pdf \
-		   mandoc_char.7.txt \
 		   mdoc.7.html \
-		   mdoc.7.xhtml \
-		   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 \
-		   roff.7.pdf \
-		   roff.7.txt \
 		   tbl.7.html \
-		   tbl.7.xhtml \
-		   tbl.7.ps \
-		   tbl.7.pdf \
-		   tbl.7.txt \
 		   mandocdb.8.html \
-		   mandocdb.8.xhtml \
-		   mandocdb.8.ps \
-		   mandocdb.8.pdf \
-		   mandocdb.8.txt
-
-$(INDEX_MANS): mandoc
-
-INDEX_OBJS	 = $(INDEX_MANS) \
 		   man.h.html \
 		   mandoc.h.html \
-		   mdoc.h.html \
-		   mdocml.tar.gz \
-		   mdocml.md5
+		   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)
@@ -324,8 +300,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
@@ -336,11 +311,11 @@ install: all
 	mkdir -p $(DESTDIR)$(MANDIR)/man1
 	mkdir -p $(DESTDIR)$(MANDIR)/man3
 	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 $(DESTDIR)$(MANDIR)/man3
+	$(INSTALL_MAN) mandoc.3 tbl.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)
 
@@ -351,16 +326,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)
@@ -389,65 +362,16 @@ mdocml.md5: mdocml.tar.gz
 mdocml.tar.gz: $(SRCS)
 	mkdir -p .dist/mdocml-$(VERSION)/
 	$(INSTALL_SOURCE) $(SRCS) .dist/mdocml-$(VERSION)
-	( cd .dist/ && tar zcf ../$@ ./ )
+	chmod 755 .dist/mdocml-$(VERSION)/configure
+	( cd .dist/ && tar zcf ../$@ mdocml-$(VERSION) )
 	rm -rf .dist/
 
-index.html: $(INDEX_OBJS)
-
-config.h: config.h.pre config.h.post
+config.h: configure config.h.pre config.h.post $(TESTSRCS)
 	rm -f config.log
-	( cat config.h.pre; \
-	  echo; \
-	  if $(CC) $(CFLAGS) -Werror -o test-ohash test-ohash.c >> config.log 2>&1; then \
-		echo '#define HAVE_OHASH'; \
-		rm test-ohash; \
-	  fi; \
-	  if $(CC) $(CFLAGS) -Werror -o test-fgetln test-fgetln.c >> config.log 2>&1; then \
-		echo '#define HAVE_FGETLN'; \
-		rm test-fgetln; \
-	  fi; \
-	  if $(CC) $(CFLAGS) -Werror -o test-strptime test-strptime.c >> config.log 2>&1; then \
-		echo '#define HAVE_STRPTIME'; \
-		rm test-strptime; \
-	  fi; \
-	  if $(CC) $(CFLAGS) -Werror -o test-getsubopt test-getsubopt.c >> config.log 2>&1; then \
-		echo '#define HAVE_GETSUBOPT'; \
-		rm test-getsubopt; \
-	  fi; \
-	  if $(CC) $(CFLAGS) -Werror -o test-strlcat test-strlcat.c >> config.log 2>&1; then \
-		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; \
-	  fi; \
-	  echo; \
-	  cat config.h.post \
-	) > $@
+	CC="$(CC)" CFLAGS="$(CFLAGS)" VERSION="$(VERSION)" ./configure
 
 .h.h.html:
 	highlight -I $< >$@
 
-.1.1.txt .3.3.txt .7.7.txt .8.8.txt:
-	./mandoc -Tascii -Wall,stop $< | col -b >$@
-
 .1.1.html .3.3.html .7.7.html .8.8.html:
 	./mandoc -Thtml -Wall,stop -Ostyle=style.css,man=%N.%S.html,includes=%I.html $< >$@
-
-.1.1.ps .3.3.ps .7.7.ps .8.8.ps:
-	./mandoc -Tps -Wall,stop $< >$@
-
-.1.1.xhtml .3.3.xhtml .7.7.xhtml .8.8.xhtml:
-	./mandoc -Txhtml -Wall,stop -Ostyle=style.css,man=%N.%S.xhtml,includes=%I.html $< >$@
-
-.1.1.pdf .3.3.pdf .7.7.pdf .8.8.pdf:
-	./mandoc -Tpdf -Wall,stop $< >$@
-
-.sgml.html:
-	validate --warn $<
-	sed -e "s!@VERSION@!$(VERSION)!" -e "s!@VDATE@!$(VDATE)!" $< >$@