summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2005-11-23 18:34:34 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2005-11-23 18:34:34 +0000
commit7125bfd190c8e24a78c0f9112f6d087f506837ec (patch)
treeec8676f8ef7ed69f5d4156b510fcca231905f4f5
parentbba04305e92227febae714b170b764fd97d8ba1c (diff)
change NOLINT into opposite sense; WANTLINT, since it lets us built
lint libraries for those libraries which want them (and can have them) ok millert
-rw-r--r--share/mk/bsd.README4
-rw-r--r--share/mk/bsd.lib.mk6
-rw-r--r--share/mk/bsd.own.mk5
3 files changed, 6 insertions, 9 deletions
diff --git a/share/mk/bsd.README b/share/mk/bsd.README
index d4ae3636815..ff832420b31 100644
--- a/share/mk/bsd.README
+++ b/share/mk/bsd.README
@@ -1,4 +1,4 @@
-# $OpenBSD: bsd.README,v 1.37 2005/04/15 17:18:57 espie Exp $
+# $OpenBSD: bsd.README,v 1.38 2005/11/23 18:34:33 deraadt Exp $
# $NetBSD: bsd.README,v 1.17 1996/04/13 02:08:08 thorpej Exp $
# @(#)bsd.README 5.1 (Berkeley) 5/11/90
@@ -237,7 +237,7 @@ NOPROFILE Do not build profiled versions of system libraries.
NOPIC Do not build PIC versions of system libraries, and
do not build shared libraries.
-NOLINT Do not build lint libraries. [set, set unconditionally]
+NOLINT Do not build lint libraries.
DEBUG Add -g to assembly, C compiler and linking passes. Also
doesn't set STRIP to -s per default if defined.
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index 7804f0dc027..a7893114d76 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: bsd.lib.mk,v 1.44 2005/09/12 17:10:40 espie Exp $
+# $OpenBSD: bsd.lib.mk,v 1.45 2005/11/23 18:34:33 deraadt Exp $
# $NetBSD: bsd.lib.mk,v 1.67 1996/01/17 20:39:26 mycroft Exp $
# @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91
@@ -134,7 +134,7 @@ _LIBS+=lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
.endif
.endif
-.if !defined(NOLINT)
+.if defined(WANTLINT)
_LIBS+=llib-l${LIB}.ln
.endif
@@ -252,7 +252,7 @@ realinstall:
${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${DESTDIR}${LIBDIR}
.endif
-.if !defined(NOLINT)
+.if defined(WANTLINT)
${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
llib-l${LIB}.ln ${DESTDIR}${LINTLIBDIR}
.endif
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 63097f6f5b8..602c6b799d8 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: bsd.own.mk,v 1.93 2005/08/08 05:53:01 espie Exp $
+# $OpenBSD: bsd.own.mk,v 1.94 2005/11/23 18:34:33 deraadt Exp $
# $NetBSD: bsd.own.mk,v 1.24 1996/04/13 02:08:09 thorpej Exp $
# Host-specific overrides
@@ -147,9 +147,6 @@ ASPICFLAG=-k
NOPROFILE=
.endif
-# No lint, for now.
-NOLINT=
-
BSD_OWN_MK=Done
.PHONY: spell clean cleandir obj manpages print all \