Rename MKPRIVATELIB to LIBISPRIVATE, to make it clearer that this is

a variable that is used by in-tree Makefiles to control behaviour.
(MKsomevar variables are generally intended to be controlled by the end-user)
This commit is contained in:
lukem 2008-05-03 14:48:30 +00:00
parent b552ef70c2
commit 66176dfdff
57 changed files with 119 additions and 121 deletions

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.8 2006/02/25 12:04:23 simonb Exp $
# $NetBSD: Makefile,v 1.9 2008/05/03 14:48:30 lukem Exp $
MKPRIVATELIB= yes
LIBISPRIVATE= yes
LIB= common
SRCS= allow.c board.c check.c fancy.c init.c odds.c \

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.2 2004/05/23 02:24:50 lukem Exp $
# $NetBSD: Makefile,v 1.3 2008/05/03 14:48:30 lukem Exp $
MKPRIVATELIB= yes
LIBISPRIVATE= yes
.include "${.CURDIR}/../Makefile.inc"

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.9 2007/04/08 09:35:32 scw Exp $
# $NetBSD: Makefile,v 1.10 2008/05/03 14:48:30 lukem Exp $
MKPRIVATELIB= yes
LIBISPRIVATE= yes
LIB= backend

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.2 2006/11/12 01:24:44 christos Exp $
# $NetBSD: Makefile,v 1.3 2008/05/03 14:48:30 lukem Exp $
MKPRIVATELIB= yes
LIBISPRIVATE= yes
# For ../Makefile.inc and bsd.own.mk
.include <bsd.init.mk>

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.2 2006/11/12 01:24:45 christos Exp $
# $NetBSD: Makefile,v 1.3 2008/05/03 14:48:30 lukem Exp $
MKPRIVATELIB= yes
LIBISPRIVATE= yes
LIB= cpp

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.3 2007/05/20 21:31:05 christos Exp $
# $NetBSD: Makefile,v 1.4 2008/05/03 14:48:30 lukem Exp $
MKPRIVATELIB= yes
LIBISPRIVATE= yes
.include <bsd.own.mk>

View File

@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.2 2006/05/29 19:18:56 nathanw Exp $
# $NetBSD: Makefile,v 1.3 2008/05/03 14:48:30 lukem Exp $
.include <bsd.own.mk>
MKPRIVATELIB= yes
LIBISPRIVATE= yes
LIB= bfd

View File

@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.7 2007/01/12 13:24:30 skrll Exp $
# $NetBSD: Makefile,v 1.8 2008/05/03 14:48:31 lukem Exp $
.include <bsd.own.mk>
.include "../Makefile.inc"
MKPRIVATELIB= yes
LIBISPRIVATE= yes
LIB= gdb
.include "${.CURDIR}/../arch/${MACHINE_ARCH}/defs.mk"

View File

@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.4 2006/11/10 17:36:08 christos Exp $
# $NetBSD: Makefile,v 1.5 2008/05/03 14:48:31 lukem Exp $
.include <bsd.own.mk>
MKPRIVATELIB= yes
LIBISPRIVATE= yes
LIB= iberty

View File

@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.2 2006/05/29 19:18:56 nathanw Exp $
# $NetBSD: Makefile,v 1.3 2008/05/03 14:48:31 lukem Exp $
.include <bsd.own.mk>
MKPRIVATELIB= yes
LIBISPRIVATE= yes
LIB= opcodes

View File

@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.2 2006/05/29 19:27:22 nathanw Exp $
# $NetBSD: Makefile,v 1.3 2008/05/03 14:48:31 lukem Exp $
.include <bsd.own.mk>
MKPRIVATELIB= yes
LIBISPRIVATE= yes
LIB= readline

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.2 2006/07/10 23:06:51 ross Exp $
# $NetBSD: Makefile,v 1.3 2008/05/03 14:48:31 lukem Exp $
MKPRIVATELIB= yes
LIBISPRIVATE= yes
NOGCCERROR=
.include <bsd.own.mk>

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.5 2006/11/10 17:36:08 christos Exp $
# $NetBSD: Makefile,v 1.6 2008/05/03 14:48:30 lukem Exp $
MKPRIVATELIB= yes
LIBISPRIVATE= yes
.include <bsd.own.mk>

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.7 2006/11/10 17:36:08 christos Exp $
# $NetBSD: Makefile,v 1.8 2008/05/03 14:48:30 lukem Exp $
MKPRIVATELIB= yes
LIBISPRIVATE= yes
.include <bsd.own.mk>

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.6 2006/11/10 17:36:08 christos Exp $
# $NetBSD: Makefile,v 1.7 2008/05/03 14:48:30 lukem Exp $
MKPRIVATELIB= yes
LIBISPRIVATE= yes
.include <bsd.own.mk>

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.3 2006/11/10 17:36:09 christos Exp $
# $NetBSD: Makefile,v 1.4 2008/05/03 14:48:30 lukem Exp $
MKPRIVATELIB= yes
LIBISPRIVATE= yes
.include "${.CURDIR}/../Makefile.inc"

View File

@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.4 2004/05/23 02:24:51 lukem Exp $
# $NetBSD: Makefile,v 1.5 2008/05/03 14:48:30 lukem Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/libs/libbib/Makefile,v 1.3 2003/05/01 13:22:19 ru Exp $
DIST_SUBDIR= src/libs/libbib
MKPRIVATELIB= yes
LIBISPRIVATE= yes
LIB= bib
SRCS= common.cpp index.cpp linear.cpp search.cpp map.c

View File

@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.4 2004/05/23 02:24:51 lukem Exp $
# $NetBSD: Makefile,v 1.5 2008/05/03 14:48:30 lukem Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/libs/libdriver/Makefile,v 1.3 2003/05/01 13:22:19 ru Exp $
DIST_SUBDIR= src/libs/libdriver
MKPRIVATELIB= yes
LIBISPRIVATE= yes
LIB= driver
SRCS= input.cpp printer.cpp

View File

@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.8 2006/02/06 18:29:48 wiz Exp $
# $NetBSD: Makefile,v 1.9 2008/05/03 14:48:30 lukem Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/libs/libgroff/Makefile,v 1.5 2003/05/01 13:22:19 ru Exp $
DIST_SUBDIR= src/libs/libgroff
MKPRIVATELIB= yes
LIBISPRIVATE= yes
LIB= groff
SRCS= assert.cpp change_lf.cpp cmap.cpp color.cpp cset.cpp \

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.21 2004/05/23 02:24:51 lukem Exp $
# $NetBSD: Makefile,v 1.22 2008/05/03 14:48:30 lukem Exp $
MKPRIVATELIB= yes
LIBISPRIVATE= yes
# Define FSYNC_ALL to get slower but safer writes in case of crashes in
# the middle of CVS/RCS changes

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.10 2006/02/25 12:04:23 simonb Exp $
# $NetBSD: Makefile,v 1.11 2008/05/03 14:48:30 lukem Exp $
MKPRIVATELIB= yes
LIBISPRIVATE= yes
LIB= common
SRCS+= substring.c xexit.c xmalloc.c xstrdup.c

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.1 2006/02/04 16:22:53 christos Exp $
# $NetBSD: Makefile,v 1.2 2008/05/03 14:48:31 lukem Exp $
MKPRIVATELIB= yes
LIBISPRIVATE= yes
.include "${.CURDIR}/../Makefile.inc"

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.1 2006/02/04 16:22:53 christos Exp $
# $NetBSD: Makefile,v 1.2 2008/05/03 14:48:31 lukem Exp $
MKPRIVATELIB= yes
LIBISPRIVATE= yes
.include "${.CURDIR}/../Makefile.inc"

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.6 2005/08/18 22:30:37 rpaulo Exp $
# $NetBSD: Makefile,v 1.7 2008/05/03 14:48:31 lukem Exp $
MKPRIVATELIB= yes
LIBISPRIVATE= yes
.include <bsd.own.mk>

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.14 2006/07/19 02:04:43 rpaulo Exp $
# $NetBSD: Makefile,v 1.15 2008/05/03 14:48:31 lukem Exp $
MKPRIVATELIB= yes
LIBISPRIVATE= yes
.include <bsd.own.mk>

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.6 2004/05/23 02:24:51 lukem Exp $
# $NetBSD: Makefile,v 1.7 2008/05/03 14:48:31 lukem Exp $
MKPRIVATELIB= yes
LIBISPRIVATE= yes
.include <bsd.own.mk>

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.1 2006/07/19 02:04:44 rpaulo Exp $
# $NetBSD: Makefile,v 1.2 2008/05/03 14:48:31 lukem Exp $
MKPRIVATELIB= yes
LIBISPRIVATE= yes
.include <bsd.own.mk>

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.2 2006/07/19 02:04:44 rpaulo Exp $
# $NetBSD: Makefile,v 1.3 2008/05/03 14:48:31 lukem Exp $
MKPRIVATELIB= yes
LIBISPRIVATE= yes
.include <bsd.own.mk>

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.17 2007/08/02 08:29:04 heas Exp $
# $NetBSD: Makefile,v 1.18 2008/05/03 14:48:31 lukem Exp $
MKPRIVATELIB= yes
LIBISPRIVATE= yes
.include <bsd.own.mk>

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.1 2006/07/19 02:04:44 rpaulo Exp $
# $NetBSD: Makefile,v 1.2 2008/05/03 14:48:31 lukem Exp $
MKPRIVATELIB= yes
LIBISPRIVATE= yes
.include <bsd.own.mk>

View File

@ -1,9 +1,9 @@
# from: @(#)Makefile 8.2 (Berkeley) 12/15/93
# $NetBSD: Makefile,v 1.28 2007/05/28 12:06:22 tls Exp $
# $NetBSD: Makefile,v 1.29 2008/05/03 14:48:31 lukem Exp $
USE_FORT?= yes # network protocol library
MKPRIVATELIB= yes
LIBISPRIVATE= yes
.include <bsd.own.mk>

View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.README,v 1.206 2008/05/02 11:45:19 lukem Exp $
# $NetBSD: bsd.README,v 1.207 2008/05/03 14:48:31 lukem Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the new (as of 1993) make "include" files
@ -755,7 +755,7 @@ USE_SHLIBDIR If not "no", use ${SHLIBINSTALLDIR} instead of ${LIBDIR}
USE_SHLIBDIR must be defined before <bsd.own.mk> is included.
Default: no
MKPRIVATELIB If not "no", act as "MKLINT=no MKPIC=no MKPROFILE=no",
LIBISPRIVATE If not "no", act as "MKDEBUGLIB=no MKLINT=no MKPIC=no MKPROFILE=no",
and don't install the (.a) library.
This is useful for "build only" helper libraries.
Default: no

View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.lib.mk,v 1.280 2008/05/03 14:36:06 lukem Exp $
# $NetBSD: bsd.lib.mk,v 1.281 2008/05/03 14:48:31 lukem Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include <bsd.init.mk>
@ -7,7 +7,9 @@
# Pull in <bsd.sys.mk> here so we can override its .c.o rule
.include <bsd.sys.mk>
.if ${MKPRIVATELIB} != "no"
LIBISPRIVATE?= no
.if ${LIBISPRIVATE} != "no"
MKDEBUGLIB:= no
MKLINT:= no
MKPIC:= no
@ -342,10 +344,10 @@ STOBJS+=${OBJS}
LOBJS+=${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.ln}
.if ${MKPRIVATELIB} != "no"
.if ${LIBISPRIVATE} != "no"
# No installation is required
libinstall::
.else # ${MKPRIVATELIB} == "no" # {
.else # ${LIBISPRIVATE} == "no" # {
.if ${MKDEBUGLIB} != "no"
_LIBS+=lib${LIB}_g.a
@ -384,7 +386,7 @@ _LIBS+=lib${LIB}.so.${SHLIB_FULLVERSION}
_LIBS+=llib-l${LIB}.ln
.endif
.endif # ${MKPRIVATELIB} == "no" # }
.endif # ${LIBISPRIVATE} == "no" # }
ALLOBJS=
.if (${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "") \

View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.own.mk,v 1.508 2008/05/02 23:12:01 ad Exp $
# $NetBSD: bsd.own.mk,v 1.509 2008/05/03 14:48:31 lukem Exp $
.if !defined(_BSD_OWN_MK_)
_BSD_OWN_MK_=1
@ -567,7 +567,7 @@ ${var}?= yes
#
.for var in \
MKCRYPTO_IDEA MKCRYPTO_MDC2 MKCRYPTO_RC5 MKDEBUG MKDEBUGLIB \
MKMANZ MKMODULAR MKOBJDIRS MKPRIVATELIB MKPUFFS MKSOFTFLOAT \
MKMANZ MKMODULAR MKOBJDIRS MKPUFFS MKSOFTFLOAT \
MKUNPRIVED MKUPDATE MKX11
${var}?=no
.endfor

View File

@ -1,12 +1,10 @@
# $NetBSD: Makefile.rump,v 1.6 2008/01/24 22:41:07 pooka Exp $
# $NetBSD: Makefile.rump,v 1.7 2008/05/03 14:48:31 lukem Exp $
#
.include <bsd.own.mk>
MKPRIVATELIB= yes
LIBISPRIVATE= yes
NOMAN= wizd
MKLINT?= no
MKPIC?= no
WARNS?= 4
DBG= -g -O0

View File

@ -1,10 +1,8 @@
# $NetBSD: Makefile.inc,v 1.4 2007/10/26 10:44:27 pooka Exp $
# $NetBSD: Makefile.inc,v 1.5 2008/05/03 14:48:31 lukem Exp $
#
MKPRIVATELIB= yes
LIBISPRIVATE= yes
NOMAN= wizd
MKLINT?= no
MKPIC?= no
WARNS?= 4
DBG= -O0 -g

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.7 2004/05/23 02:24:51 lukem Exp $
# $NetBSD: Makefile,v 1.8 2008/05/03 14:48:31 lukem Exp $
MKPRIVATELIB= yes
LIBISPRIVATE= yes
LIB= audio
SRCS= audio.c wav.c sun.c

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.8 2006/10/12 19:59:13 peter Exp $
# $NetBSD: Makefile,v 1.9 2008/05/03 14:48:31 lukem Exp $
MKPRIVATELIB= yes
LIBISPRIVATE= yes
.include <bsd.own.mk>

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.6 2004/05/23 02:24:52 lukem Exp $
# $NetBSD: Makefile,v 1.7 2008/05/03 14:48:31 lukem Exp $
MKPRIVATELIB= yes
LIBISPRIVATE= yes
LIB= common
SRCS= dovend.c dumptab.c getif.c hash.c hwaddr.c lookup.c readfile.c \

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.22 2004/05/23 02:24:52 lukem Exp $
# $NetBSD: Makefile,v 1.23 2008/05/03 14:48:32 lukem Exp $
MKPRIVATELIB= yes
LIBISPRIVATE= yes
LIB = dhcp
SRCS = raw.c parse.c nit.c icmp.c dispatch.c conflex.c upf.c bpf.c socket.c \

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.5 2004/05/23 02:24:52 lukem Exp $
# $NetBSD: Makefile,v 1.6 2008/05/03 14:48:32 lukem Exp $
MKPRIVATELIB= yes
LIBISPRIVATE= yes
LIB = dhcpctl
SRCS = dhcpctl.c callback.c remote.c

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.7 2004/05/23 02:24:52 lukem Exp $
# $NetBSD: Makefile,v 1.8 2008/05/03 14:48:32 lukem Exp $
MKPRIVATELIB= yes
LIBISPRIVATE= yes
LIB = dst
SRCS = dst_support.c dst_api.c hmac_link.c md5_dgst.c base64.c prandom.c

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.8 2004/05/23 02:24:52 lukem Exp $
# $NetBSD: Makefile,v 1.9 2008/05/03 14:48:32 lukem Exp $
MKPRIVATELIB= yes
LIBISPRIVATE= yes
LIB = minires
SRCS = res_mkupdate.c res_init.c res_update.c res_send.c res_comp.c \

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.8 2004/05/23 02:24:52 lukem Exp $
# $NetBSD: Makefile,v 1.9 2008/05/03 14:48:32 lukem Exp $
MKPRIVATELIB= yes
LIBISPRIVATE= yes
LIB = omapi
SRCS = protocol.c buffer.c alloc.c result.c connection.c errwarn.c \

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.8 2007/05/16 04:26:07 taca Exp $
# $NetBSD: Makefile,v 1.9 2008/05/03 14:48:32 lukem Exp $
MKPRIVATELIB= yes
LIBISPRIVATE= yes
LIB= ipf

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.10 2004/05/23 14:05:39 tron Exp $
# $NetBSD: Makefile,v 1.11 2008/05/03 14:48:32 lukem Exp $
MKPRIVATELIB= yes
LIBISPRIVATE= yes
LIB= common
SRCS= common.c common_vars.c displayq.c fatal.c rmjob.c startdaemon.c

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.10 2006/05/12 01:54:57 mrg Exp $
# $NetBSD: Makefile,v 1.11 2008/05/03 14:48:32 lukem Exp $
MKPRIVATELIB= yes
LIBISPRIVATE= yes
LIB= common
SRCS= cmp.c device.c dl.c file.c get.c log.c loop-bsd.c mopdef.c nma.c pf.c \

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.4 2006/06/11 19:34:22 kardel Exp $
# $NetBSD: Makefile,v 1.5 2008/05/03 14:48:32 lukem Exp $
MKPRIVATELIB= yes
LIBISPRIVATE= yes
LIB= isc
SRCS= assertions.c error.c interfaceiter.c isc_strerror.c lib.c mem.c \

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.9 2006/08/26 18:15:37 christos Exp $
# $NetBSD: Makefile,v 1.10 2008/05/03 14:48:32 lukem Exp $
MKPRIVATELIB= yes
LIBISPRIVATE= yes
LIB= ntp
SRCS= a_md5encrypt.c adjtime.c atoint.c atolfp.c atouint.c \

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.1 2007/01/06 19:45:29 kardel Exp $
# $NetBSD: Makefile,v 1.2 2008/05/03 14:48:32 lukem Exp $
MKPRIVATELIB= yes
LIBISPRIVATE= yes
LIB= opts
SRCS= libopts.c

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.6 2006/06/11 19:34:28 kardel Exp $
# $NetBSD: Makefile,v 1.7 2008/05/03 14:48:32 lukem Exp $
MKPRIVATELIB= yes
LIBISPRIVATE= yes
LIB= parse
SRCS= binio.c clk_computime.c clk_dcf7000.c clk_hopf6021.c \

View File

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.33 2008/02/22 16:20:53 joerg Exp $
# $NetBSD: Makefile,v 1.34 2008/05/03 14:48:32 lukem Exp $
# Original from FreeBSD, no rcs id.
MKPRIVATELIB= yes
LIBISPRIVATE= yes
LIB= install
SRCS= automatic.c conflicts.c decompress.c dewey.c \

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.12 2006/08/26 18:15:39 christos Exp $
# $NetBSD: Makefile,v 1.13 2008/05/03 14:48:32 lukem Exp $
MKPRIVATELIB= yes
LIBISPRIVATE= yes
LIB= sup

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.10 2004/05/23 02:24:52 lukem Exp $
# $NetBSD: Makefile,v 1.11 2008/05/03 14:48:32 lukem Exp $
MKPRIVATELIB= yes
LIBISPRIVATE= yes
LIB= common
SRCS= localhostname.c ypdb.c yplib_host.c ypresp_xdr.c

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.5 2004/05/23 02:24:52 lukem Exp $
# $NetBSD: Makefile,v 1.6 2008/05/03 14:48:32 lukem Exp $
MKPRIVATELIB= yes
LIBISPRIVATE= yes
.include <bsd.own.mk>

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.4 2004/05/23 02:24:52 lukem Exp $
# $NetBSD: Makefile,v 1.5 2008/05/03 14:48:32 lukem Exp $
MKPRIVATELIB= yes
LIBISPRIVATE= yes
.include <bsd.own.mk>

View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.4 2004/05/23 02:24:52 lukem Exp $
# $NetBSD: Makefile,v 1.5 2008/05/03 14:48:32 lukem Exp $
MKPRIVATELIB= yes
LIBISPRIVATE= yes
.include <bsd.own.mk>