===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.396
retrieving revision 1.400
diff -u -p -r1.396 -r1.400
--- mandoc/Makefile	2012/06/08 10:47:17	1.396
+++ mandoc/Makefile	2012/06/09 14:19:55	1.400
@@ -1,11 +1,7 @@
 .PHONY: 	 clean install installwww
 .SUFFIXES:	 .sgml .html .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
 
 # Specify this if you want to hard-code the operating system to appear
 # in the lower-left hand corner of -mdoc manuals.
@@ -107,7 +103,6 @@ SRCS		 = Makefile \
 		   mandoc_char.7 \
 		   mandocdb.8 \
 		   mandocdb.c \
-		   mandocdb.h \
 		   manpath.c \
 		   manpath.h \
 		   mdoc.7 \
@@ -147,6 +142,7 @@ SRCS		 = Makefile \
 		   test-fgetln.c \
 		   test-getsubopt.c \
 		   test-mmap.c \
+		   test-ohash.c \
 		   test-strlcat.c \
 		   test-strlcpy.c \
 		   test-strptime.c \
@@ -187,6 +183,7 @@ LIBMANDOC_OBJS	 = $(LIBMAN_OBJS) \
 
 COMPAT_OBJS	 = compat_fgetln.o \
 		   compat_getsubopt.o \
+		   compat_ohash.o \
 		   compat_strlcat.o \
 		   compat_strlcpy.o
 
@@ -203,7 +200,7 @@ $(LIBMAN_OBJS): libman.h
 $(LIBMDOC_OBJS): libmdoc.h
 $(LIBROFF_OBJS): libroff.h
 $(LIBMANDOC_OBJS): mandoc.h mdoc.h man.h libmandoc.h config.h
-$(COMPAT_OBJS): config.h
+$(COMPAT_OBJS): config.h compat_ohash.h
 
 MANDOC_HTML_OBJS = eqn_html.o \
 		   html.o \
@@ -232,75 +229,31 @@ MANDOC_OBJS	 = $(MANDOC_HTML_OBJS) \
 $(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): 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): 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): 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 \
 		   mandoc.1.html \
-		   mandoc.1.xhtml \
-		   mandoc.1.ps \
-		   mandoc.1.pdf \
-		   mandoc.1.txt \
 		   mandoc.3.html \
-		   mandoc.3.xhtml \
-		   mandoc.3.ps \
-		   mandoc.3.pdf \
-		   mandoc.3.txt \
 		   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
+		   mandocdb.8.html
 
 $(INDEX_MANS): mandoc
 
@@ -396,6 +349,10 @@ config.h: config.h.pre config.h.post
 	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; \
@@ -427,20 +384,8 @@ config.h: config.h.pre config.h.post
 .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 $<