From 068b7390b9e34b8c5712ddcd45564cd36ee2030a Mon Sep 17 00:00:00 2001
From: okan <>
Date: Thu, 2 Aug 2012 13:38:39 +0000
Subject: [PATCH] remove leftover NOLINT, WANTLINT, LINTFLAGS, LOBJ vars and
 lint targets.

ok guenther@
---
 src/lib/libc/string/Makefile.inc | 22 +---------------------
 src/lib/libutil/Makefile         |  3 +--
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/src/lib/libc/string/Makefile.inc b/src/lib/libc/string/Makefile.inc
index 25e67e4f..6b78a4d0 100644
--- a/src/lib/libc/string/Makefile.inc
+++ b/src/lib/libc/string/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.28 2012/01/17 02:48:01 guenther Exp $
+#	$OpenBSD: Makefile.inc,v 1.29 2012/08/02 13:38:38 okan Exp $
 
 # string sources
 .PATH: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/string ${LIBCSRCDIR}/string
@@ -120,26 +120,6 @@ strrchr.so: rindex.c
 	    -o ${.TARGET}
 .endif
 
-# build .ln files for memmove, memcpy, strchr and strrchr always from
-# bcopy, index, and rindex
-LOBJS+=	memmove.ln memcpy.ln strchr.ln strrchr.ln
-
-memmove.ln: bcopy.c
-	lint ${LINTFLAGS} -DMEMMOVE ${CFLAGS:M-[IDU]*} -i -o ${.TARGET} \
-		${LIBCSRCDIR}/string/bcopy.c
-
-memcpy.ln: bcopy.c
-	lint ${LINTFLAGS} -DMEMCOPY ${CFLAGS:M-[IDU]*} -i -o ${.TARGET} \
-		${LIBCSRCDIR}/string/bcopy.c
-
-strchr.ln: index.c
-	lint ${LINTFLAGS} -DSTRCHR ${CFLAGS:M-[IDU]*} -i -o ${.TARGET} \
-		${LIBCSRCDIR}/string/index.c
-
-strrchr.ln: rindex.c
-	lint ${LINTFLAGS} -DSTRRCHR ${CFLAGS:M-[IDU]*} -i -o ${.TARGET} \
-		${LIBCSRCDIR}/string/rindex.c
-
 MAN+=	bm.3 bcmp.3 bcopy.3 bstring.3 bzero.3 ffs.3 memccpy.3 memchr.3 \
 	memcmp.3 memcpy.3 memmove.3 memset.3 stpcpy.3 strcasecmp.3 strcat.3 \
 	strchr.3 strcmp.3 strcoll.3 strcpy.3 strcspn.3 strerror.3 \
diff --git a/src/lib/libutil/Makefile b/src/lib/libutil/Makefile
index b7b5f6dd..2bc59392 100644
--- a/src/lib/libutil/Makefile
+++ b/src/lib/libutil/Makefile
@@ -1,8 +1,7 @@
-#	$OpenBSD: Makefile,v 1.33 2010/11/17 10:10:31 jsing Exp $
+#	$OpenBSD: Makefile,v 1.34 2012/08/02 13:38:39 okan Exp $
 #	$NetBSD: Makefile,v 1.8 1996/05/16 07:03:28 thorpej Exp $
 
 LIB=	util
-WANTLINT=
 
 HDRS=	util.h imsg.h
 SRCS=	check_expire.c duid.c getmaxpartitions.c getrawpartition.c login.c \