===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.396
retrieving revision 1.399
diff -u -p -r1.396 -r1.399
--- mandoc/Makefile	2012/06/08 10:47:17	1.396
+++ mandoc/Makefile	2012/06/09 14:11:15	1.399
@@ -107,7 +107,6 @@ SRCS		 = Makefile \
 		   mandoc_char.7 \
 		   mandocdb.8 \
 		   mandocdb.c \
-		   mandocdb.h \
 		   manpath.c \
 		   manpath.h \
 		   mdoc.7 \
@@ -147,6 +146,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 +187,7 @@ LIBMANDOC_OBJS	 = $(LIBMAN_OBJS) \
 
 COMPAT_OBJS	 = compat_fgetln.o \
 		   compat_getsubopt.o \
+		   compat_ohash.o \
 		   compat_strlcat.o \
 		   compat_strlcpy.o
 
@@ -203,7 +204,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,16 +233,16 @@ 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
@@ -396,6 +397,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; \