From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 00:49:07 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7E63897A; Sun, 30 Nov 2014 00:49:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 51DCBBEE; Sun, 30 Nov 2014 00:49:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAU0n7PC015820; Sun, 30 Nov 2014 00:49:07 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAU0n7Nv015819; Sun, 30 Nov 2014 00:49:07 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411300049.sAU0n7Nv015819@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 30 Nov 2014 00:49:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275288 - projects/building-blocks/lib X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 00:49:07 -0000 Author: ngie Date: Sun Nov 30 00:49:06 2014 New Revision: 275288 URL: https://svnweb.freebsd.org/changeset/base/275288 Log: Honor MK_AUDIT, MK_FILE, MK_GPIO, and MK_SQLITE3 lib/libgpio is a standalone library, but it seems logical to conditionalize it with MK_GPIO Modified: projects/building-blocks/lib/Makefile Modified: projects/building-blocks/lib/Makefile ============================================================================== --- projects/building-blocks/lib/Makefile Sun Nov 30 00:45:33 2014 (r275287) +++ projects/building-blocks/lib/Makefile Sun Nov 30 00:49:06 2014 (r275288) @@ -25,7 +25,7 @@ SUBDIR= ${SUBDIR_ORDERED} \ libalias \ libarchive \ ${_libatm} \ - libauditd \ + ${_libauditd} \ libbegemot \ libblocksruntime \ ${_libbluetooth} \ @@ -52,7 +52,7 @@ SUBDIR= ${SUBDIR_ORDERED} \ libfigpar \ libgeom \ ${_libgpib} \ - libgpio \ + ${_libgpio} \ ${_libgssapi} \ ${_librpcsec_gss} \ ${_libiconv_modules} \ @@ -62,7 +62,7 @@ SUBDIR= ${SUBDIR_ORDERED} \ libkvm \ ${_libldns} \ liblzma \ - libmagic \ + ${_libmagic} \ libmandoc \ libmemstat \ libmd \ @@ -91,7 +91,7 @@ SUBDIR= ${SUBDIR_ORDERED} \ ${_libsmb} \ ${_libsmdb} \ ${_libsmutil} \ - libsqlite3 \ + ${_libsqlite3} \ libstand \ libstdbuf \ libstdthreads \ @@ -168,6 +168,10 @@ _csu=csu _libngatm= libngatm .endif +.if ${MK_AUDIT} != "no" +_libauditd= libauditd +.endif + .if ${MK_BHYVE} != "no" _libvmmapi= libvmmapi .endif @@ -194,10 +198,18 @@ _clang= clang _cuse= libcuse .endif +.if ${MK_FILE} != "no" +_libmagic= libmagic +.endif + .if ${MK_GPIB} != "no" _libgpib= libgpib .endif +.if ${MK_GPIO} != "no" +_libgpio= libgpio +.endif + .if ${MK_GSSAPI} != "no" _libgssapi= libgssapi _librpcsec_gss= librpcsec_gss @@ -281,6 +293,10 @@ _libsmdb= libsmdb _libsmutil= libsmutil .endif +.if ${MK_SQLITE3} != "no" +_libsqlite3= libsqlite3 +.endif + .if ${MK_TELNET} != "no" _libtelnet= libtelnet .endif