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.
This commit is contained in:
+12
-5
@@ -151,11 +151,18 @@ STRIP?= -s
|
|||||||
@${LD} -o ${.TARGET}.tmp -x -r ${.TARGET}
|
@${LD} -o ${.TARGET}.tmp -x -r ${.TARGET}
|
||||||
@mv ${.TARGET}.tmp ${.TARGET}
|
@mv ${.TARGET}.tmp ${.TARGET}
|
||||||
|
|
||||||
.if !defined(INTERNALLIB) || defined(INTERNALSTATICLIB)
|
.if defined(INTERNALLIB) || defined(NOLIB)
|
||||||
.if !defined(NOPROFILE) && !defined(INTERNALLIB)
|
NOPROFILE= 1
|
||||||
_LIBS=lib${LIB}.a lib${LIB}_p.a
|
NOPIC= 1
|
||||||
.else
|
NOINSTALLLIB= 1
|
||||||
|
NOMAN= 1
|
||||||
|
.endif
|
||||||
|
|
||||||
|
.if !defined(NOLIB)
|
||||||
|
.if defined(NOPROFILE)
|
||||||
_LIBS=lib${LIB}.a
|
_LIBS=lib${LIB}.a
|
||||||
|
.else
|
||||||
|
_LIBS=lib${LIB}.a lib${LIB}_p.a
|
||||||
.endif
|
.endif
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
@@ -300,7 +307,7 @@ _SHLINSTALLFLAGS:= ${_SHLINSTALLFLAGS${ie}}
|
|||||||
realinstall: beforeinstall
|
realinstall: beforeinstall
|
||||||
realinstall: _libinstall
|
realinstall: _libinstall
|
||||||
_libinstall:
|
_libinstall:
|
||||||
.if !defined(INTERNALLIB)
|
.if !defined(INTERNALLIB) && !defined(NOLIB)
|
||||||
${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
|
${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
|
||||||
${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR}
|
${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR}
|
||||||
.if !defined(NOPROFILE)
|
.if !defined(NOPROFILE)
|
||||||
|
|||||||
Reference in New Issue
Block a user