===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.311
retrieving revision 1.313
diff -u -p -r1.311 -r1.313
--- mandoc/Makefile	2011/02/09 10:03:02	1.311
+++ mandoc/Makefile	2011/03/17 09:25:54	1.313
@@ -43,15 +43,15 @@ MANDOCSRCS = mandoc.c
 
 MANDOCOBJS = mandoc.o
 
-MDOCLNS	   = mdoc_macro.ln mdoc.ln mdoc_hash.ln mdoc_strings.ln \
+MDOCLNS	   = mdoc_macro.ln mdoc.ln mdoc_hash.ln \
 	     mdoc_argv.ln mdoc_validate.ln \
 	     lib.ln att.ln arch.ln vol.ln msec.ln st.ln
 
-MDOCOBJS   = mdoc_macro.o mdoc.o mdoc_hash.o mdoc_strings.o \
+MDOCOBJS   = mdoc_macro.o mdoc.o mdoc_hash.o \
 	     mdoc_argv.o mdoc_validate.o lib.o att.o \
 	     arch.o vol.o msec.o st.o
 
-MDOCSRCS   = mdoc_macro.c mdoc.c mdoc_hash.c mdoc_strings.c \
+MDOCSRCS   = mdoc_macro.c mdoc.c mdoc_hash.c \
 	     mdoc_argv.c mdoc_validate.c lib.c att.c \
 	     arch.c vol.c msec.c st.c
 
@@ -217,8 +217,6 @@ mdoc_macro.ln mdoc_macro.o: mdoc_macro.c libmdoc.h
 
 mdoc_term.ln mdoc_term.o: mdoc_term.c term.h mdoc.h
 
-mdoc_strings.ln mdoc_strings.o: mdoc_strings.c libmdoc.h
-
 man_hash.ln man_hash.o: man_hash.c libman.h
 
 mdoc_hash.ln mdoc_hash.o: mdoc_hash.c libmdoc.h
@@ -333,13 +331,13 @@ config.h: config.h.pre config.h.post
 	rm -f config.log
 	( cat config.h.pre; \
 	echo; \
-	if $(CC) $(CFLAGS) -Werror -c test-strlcat.c >> config.log 2>&1; then \
+	if $(CC) $(CFLAGS) -Werror -o test-strlcat test-strlcat.c >> config.log 2>&1; then \
 		echo '#define HAVE_STRLCAT'; \
-		rm test-strlcat.o; \
+		rm test-strlcat; \
 	fi; \
-	if $(CC) $(CFLAGS) -Werror -c test-strlcpy.c >> config.log 2>&1; then \
+	if $(CC) $(CFLAGS) -Werror -o test-strlcpy test-strlcpy.c >> config.log 2>&1; then \
 		echo '#define HAVE_STRLCPY'; \
-		rm test-strlcpy.o; \
+		rm test-strlcpy; \
 	fi; \
 	echo; \
 	cat config.h.post \