From 1f47da09fc375f632807c015469b7f2a9ab32fff Mon Sep 17 00:00:00 2001 From: emaste Date: Fri, 21 Apr 2017 13:39:14 +0000 Subject: [PATCH] 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 --- gnu/usr.bin/Makefile | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile index 1dc26f32968e..f05e2c94b663 100644 --- a/gnu/usr.bin/Makefile +++ b/gnu/usr.bin/Makefile @@ -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=