From owner-svn-src-all@freebsd.org  Fri Apr 21 13:39:16 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 393B3D4123A;
 Fri, 21 Apr 2017 13:39:16 +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 0AE9D1A24;
 Fri, 21 Apr 2017 13:39:15 +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 v3LDdFHR009447;
 Fri, 21 Apr 2017 13:39:15 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3LDdFxk009446;
 Fri, 21 Apr 2017 13:39:15 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201704211339.v3LDdFxk009446@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: Fri, 21 Apr 2017 13:39:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r317252 - head/gnu/usr.bin
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Apr 2017 13:39:16 -0000

Author: emaste
Date: Fri Apr 21 13:39:14 2017
New Revision: 317252
URL: https://svnweb.freebsd.org/changeset/base/317252

Log:
  Simplify gnu/usr.bin Makefile conditions
  
  After r307655 MK_GDB is forced to no if MK_BINUTILS is no, and similarly
  MK_GROFF is forced to no if MK_CXX is no, so we can remove nested
  conditionals.
  
  Reviewed by:	bapt, brooks
  Sponsored by:	The FreeBSD Foundation
  Differential Revision:	https://reviews.freebsd.org/D8287

Modified:
  head/gnu/usr.bin/Makefile

Modified: head/gnu/usr.bin/Makefile
==============================================================================
--- head/gnu/usr.bin/Makefile	Fri Apr 21 11:48:12 2017	(r317251)
+++ head/gnu/usr.bin/Makefile	Fri Apr 21 13:39:14 2017	(r317252)
@@ -5,21 +5,17 @@
 
 .if ${MK_CXX} != "no"
 SUBDIR.${MK_GCC}+=	gperf
-SUBDIR.${MK_GROFF}+=	groff
 .endif
 
 SUBDIR.${MK_BINUTILS}+=	binutils
 SUBDIR.${MK_DIALOG}+=	dialog
-
-.if ${MK_BINUTILS} != "no"
-SUBDIR.${MK_GDB}+=	gdb
-SUBDIR_DEPEND_gdb=	binutils
-.endif
-
 SUBDIR.${MK_GCC}+=	cc
 SUBDIR.${MK_GNU_DIFF}+=	diff3
 SUBDIR.${MK_GNU_GREP}+=	grep
+SUBDIR.${MK_GDB}+=	gdb
+SUBDIR_DEPEND_gdb=	binutils
 SUBDIR.${MK_GPL_DTC}+=	dtc
+SUBDIR.${MK_GROFF}+=	groff
 SUBDIR.${MK_TESTS}+=	tests
 
 SUBDIR_PARALLEL=