aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.inc11
-rw-r--r--cddl/lib/libdtrace/Makefile2
-rw-r--r--share/mk/bsd.README2
-rw-r--r--share/mk/bsd.lib.mk5
4 files changed, 8 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index 5e9b9b138309..63f74ce9f2b6 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -336,6 +336,7 @@ LIB32WMAKEFLAGS+= \
CXX="${CXX} ${LIB32FLAGS}" \
DESTDIR=${LIB32TMP} \
-DCOMPAT_32BIT \
+ -DLIBRARIES_ONLY \
-DNO_CPU_CFLAGS \
-DNO_CTF \
-DNO_LINT
diff --git a/cddl/lib/libdtrace/Makefile b/cddl/lib/libdtrace/Makefile
index 3a79e8732d77..17f0be6c4c27 100644
--- a/cddl/lib/libdtrace/Makefile
+++ b/cddl/lib/libdtrace/Makefile
@@ -103,7 +103,7 @@ dt_names.c:
beforedepend: dt_errtags.c dt_names.c
beforeinstall:
-.if exists(${DESTDIR}/usr/lib/dtrace)
+.if !defined(LIBRARIES_ONLY) && exists(${DESTDIR}/usr/lib/dtrace)
.for file in ${DSRCS}
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} ${.CURDIR}/${file} ${DESTDIR}/usr/lib/dtrace
.endfor
diff --git a/share/mk/bsd.README b/share/mk/bsd.README
index f09142e838e3..a9adc1f2201f 100644
--- a/share/mk/bsd.README
+++ b/share/mk/bsd.README
@@ -356,6 +356,8 @@ SHLIB_LDSCRIPT Template file to generate shared library linker script.
Unless used, a simple symlink is created to the real
shared object.
+LIBRARIES_ONLY Do not build or install files other than the library.
+
The include file <bsd.lib.mk> includes the file named "../Makefile.inc"
if it exists, as well as the include file <bsd.man.mk>.
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index 1335964f1b42..e39c7a52a066 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -331,9 +331,12 @@ _libinstall:
.endif
.endif # !defined(INTERNALLIB)
+.if !defined(LIBRARIES_ONLY)
.include <bsd.nls.mk>
.include <bsd.files.mk>
.include <bsd.incs.mk>
+.endif
+
.include <bsd.links.mk>
.if ${MK_MAN} != "no"
@@ -348,7 +351,7 @@ lint: ${SRCS:M*.c}
${LINT} ${LINTFLAGS} ${CFLAGS:M-[DIU]*} ${.ALLSRC}
.endif
-.if ${MK_MAN} != "no"
+.if ${MK_MAN} != "no" && !defined(LIBRARIES_ONLY)
.include <bsd.man.mk>
.endif