From owner-svn-src-head@freebsd.org  Wed Oct 19 19:32:08 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1F409C175E4;
 Wed, 19 Oct 2016 19:32:08 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 E2E13FB5;
 Wed, 19 Oct 2016 19:32:07 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9JJW7pM005034;
 Wed, 19 Oct 2016 19:32:07 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9JJW7C4005033;
 Wed, 19 Oct 2016 19:32:07 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201610191932.u9JJW7C4005033@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Wed, 19 Oct 2016 19:32:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r307652 - head/gnu/lib
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Oct 2016 19:32:08 -0000

Author: emaste
Date: Wed Oct 19 19:32:06 2016
New Revision: 307652
URL: https://svnweb.freebsd.org/changeset/base/307652

Log:
  Switch gnu/lib/Makefile to SUBDIR.${MK_*} optional subdir style
  
  Compound conditions are left unchanged

Modified:
  head/gnu/lib/Makefile

Modified: head/gnu/lib/Makefile
==============================================================================
--- head/gnu/lib/Makefile	Wed Oct 19 18:45:06 2016	(r307651)
+++ head/gnu/lib/Makefile	Wed Oct 19 19:32:06 2016	(r307652)
@@ -5,18 +5,9 @@
 SUBDIR= csu libgcc libregex
 
 SUBDIR.${MK_DIALOG}+=	libdialog
-
-.if ${MK_GCC} != "no"
-SUBDIR+= libgcov libgomp
-.endif
-
-.if ${MK_SSP} != "no"
-SUBDIR+= libssp
-.endif
-
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_GCC}+=	libgcov libgomp
+SUBDIR.${MK_SSP}+=	libssp
+SUBDIR.${MK_TESTS}+=	tests
 
 .if ${MK_BINUTILS} != "no" && ${MK_GDB} != "no"
 SUBDIR+=	libreadline