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=
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to