Author: brooks
Date: Fri Mar 15 20:34:10 2013
New Revision: 248350
URL: http://svnweb.freebsd.org/changeset/base/248350
Log:
MFC r245561,245885:
Add a new LIBRARIES_ONLY make variable to disable the build and install
of files other than the actual libraries.
Use LIBRARIES_ONLY to supress the inclusion of files in the lib32
distribution that are duplicates of files in base.
Sponsored by: DARPA, AFRL
Reviewed by: emaste
Modified:
stable/9/Makefile.inc1 (contents, props changed)
stable/9/cddl/lib/libdtrace/Makefile
stable/9/share/mk/bsd.README
stable/9/share/mk/bsd.lib.mk
Directory Properties:
stable/9/cddl/lib/libdtrace/ (props changed)
stable/9/share/mk/ (props changed)
Modified: stable/9/Makefile.inc1
==============================================================================
--- stable/9/Makefile.inc1 Fri Mar 15 20:29:31 2013 (r248349)
+++ stable/9/Makefile.inc1 Fri Mar 15 20:34:10 2013 (r248350)
@@ -330,6 +330,7 @@ LIB32WMAKEFLAGS+= \
CXX="${CXX} ${LIB32FLAGS}" \
DESTDIR=${LIB32TMP} \
-DCOMPAT_32BIT \
+ -DLIBRARIES_ONLY \
-DNO_CPU_CFLAGS \
-DNO_CTF \
-DNO_LINT
Modified: stable/9/cddl/lib/libdtrace/Makefile
==============================================================================
--- stable/9/cddl/lib/libdtrace/Makefile Fri Mar 15 20:29:31 2013
(r248349)
+++ stable/9/cddl/lib/libdtrace/Makefile Fri Mar 15 20:34:10 2013
(r248350)
@@ -95,7 +95,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
Modified: stable/9/share/mk/bsd.README
==============================================================================
--- stable/9/share/mk/bsd.README Fri Mar 15 20:29:31 2013
(r248349)
+++ stable/9/share/mk/bsd.README Fri Mar 15 20:34:10 2013
(r248350)
@@ -356,6 +356,8 @@ SHLIB_LDSCRIPT Template file to generate
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>.
Modified: stable/9/share/mk/bsd.lib.mk
==============================================================================
--- stable/9/share/mk/bsd.lib.mk Fri Mar 15 20:29:31 2013
(r248349)
+++ stable/9/share/mk/bsd.lib.mk Fri Mar 15 20:34:10 2013
(r248350)
@@ -313,12 +313,15 @@ _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"
+.if ${MK_MAN} != "no" && !defined(LIBRARIES_ONLY)
realinstall: _maninstall
.ORDER: beforeinstall _maninstall
.endif
@@ -330,7 +333,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
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
