From cc06ac9240a7833004d4bd60c2168ebb004090aa Mon Sep 17 00:00:00 2001 From: obrien Date: Thu, 9 May 2002 00:44:13 +0000 Subject: [PATCH] Get rid of the INTERNALSTATICLIB knob and just use plain INTERNALLIB. INTERNALLIB now implies NOPROFILE, NOMAN, and don't install anything. Add a NOLIB knob. --- share/mk/bsd.lib.mk | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 8bf4d77bbafb..9e52d9ecacee 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -151,11 +151,18 @@ STRIP?= -s @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET} @mv ${.TARGET}.tmp ${.TARGET} -.if !defined(INTERNALLIB) || defined(INTERNALSTATICLIB) -.if !defined(NOPROFILE) && !defined(INTERNALLIB) -_LIBS=lib${LIB}.a lib${LIB}_p.a -.else +.if defined(INTERNALLIB) || defined(NOLIB) +NOPROFILE= 1 +NOPIC= 1 +NOINSTALLLIB= 1 +NOMAN= 1 +.endif + +.if !defined(NOLIB) +.if defined(NOPROFILE) _LIBS=lib${LIB}.a +.else +_LIBS=lib${LIB}.a lib${LIB}_p.a .endif .endif @@ -300,7 +307,7 @@ _SHLINSTALLFLAGS:= ${_SHLINSTALLFLAGS${ie}} realinstall: beforeinstall realinstall: _libinstall _libinstall: -.if !defined(INTERNALLIB) +.if !defined(INTERNALLIB) && !defined(NOLIB) ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR} .if !defined(NOPROFILE)