Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Explicitly set MKLINT=no if MKLINKLIB==no, rather than just acting that way.

This commit is contained in:
lukem 2008-05-02 11:45:19 +00:00
parent 3e0e2ca90a
commit d77bf7654f
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
share/mk/bsd.README
View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.README,v 1.205 2008/04/30 21:15:33 garbled Exp $
# $NetBSD: bsd.README,v 1.206 2008/05/02 11:45:19 lukem Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the new (as of 1993) make "include" files
@ -188,7 +188,7 @@ MKKERBEROS If "no", disables building of Kerberos v5
infrastructure (libraries and support programs).
Default: yes
MKLINKLIB If "no", act as "MKPICINSTALL=no MKPROFILE=no".
MKLINKLIB If "no", act as "MKLINT=no MKPICINSTALL=no MKPROFILE=no".
Also:
- don't install the .a libraries
- don't install _pic.a libraries on PIC systems
@ -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 "MKPROFILE=no MKPIC=no MKLINT=no",
MKPRIVATELIB If not "no", act as "MKLINT=no MKPIC=no MKPROFILE=no",
and don't install the (.a) library.
This is useful for "build only" helper libraries.
Default: no

8
share/mk/bsd.lib.mk
View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.lib.mk,v 1.278 2008/04/29 07:48:31 simonb Exp $
# $NetBSD: bsd.lib.mk,v 1.279 2008/05/02 11:45:19 lukem Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include <bsd.init.mk>
@ -372,7 +372,7 @@ _LIBS+=lib${LIB}.so.${SHLIB_FULLVERSION}
.endif # }
LOBJS+=${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.ln}
.if ${MKLINT} != "no" && ${MKLINKLIB} != "no" && !empty(LOBJS)
.if ${MKLINT} != "no" && !empty(LOBJS)
_LIBS+=llib-l${LIB}.ln
.endif
@ -384,7 +384,7 @@ ALLOBJS=
ALLOBJS+=${STOBJS}
.endif
ALLOBJS+=${POBJS} ${SOBJS}
.if ${MKLINT} != "no" && ${MKLINKLIB} != "no" && !empty(LOBJS)
.if ${MKLINT} != "no" && !empty(LOBJS)
ALLOBJS+=${LOBJS}
.endif
.else # !defined(LIB) # } {
@ -635,7 +635,7 @@ ${DESTDIR}${_LIBSODIR}/lib${LIB}.so.${SHLIB_FULLVERSION}: lib${LIB}.so.${SHLIB_F
.endif
.endif
.if ${MKLINT} != "no" && ${MKLINKLIB} != "no" && !empty(LOBJS)
.if ${MKLINT} != "no" && !empty(LOBJS)
libinstall:: ${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln
.PRECIOUS: ${DESTDIR}${LINTLIBDIR}/llib-l${LIB}.ln

3
share/mk/bsd.own.mk
View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.own.mk,v 1.506 2008/04/30 21:15:33 garbled Exp $
# $NetBSD: bsd.own.mk,v 1.507 2008/05/02 11:45:19 lukem Exp $
.if !defined(_BSD_OWN_MK_)
_BSD_OWN_MK_=1
@ -581,6 +581,7 @@ MKHTML:= no
.endif
.if ${MKLINKLIB} == "no"
MKLINT:= no
MKPICINSTALL:= no
MKPROFILE:= no
.endif