[src/trunk]: src Make handling of USETOOLS uniform: Don't need to check whet...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src Make handling of USETOOLS uniform: Don't need to check whet...
From: tv <tv%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 09:56:16 +0000

details:   https://anonhg.NetBSD.org/src/rev/857b1500fbea
branches:  trunk
changeset: 516827:857b1500fbea
user:      tv <tv%NetBSD.org@localhost>
date:      Wed Oct 31 16:15:00 2001 +0000

description:
Make handling of USETOOLS uniform:  Don't need to check whether it is
defined, as <bsd.own.mk> always sets it; also, compare only against "yes"
(not "no") for a yes/no check, as there are two negative states ("no" and
"never").

diffstat:

 lib/libasn1/Makefile      |  8 ++++----
 lib/libcom_err/Makefile   |  8 ++++----
 lib/libhdb/Makefile       |  6 +++---
 lib/libkadm/Makefile      |  4 ++--
 lib/libkadm5clnt/Makefile |  4 ++--
 lib/libkadm5srv/Makefile  |  4 ++--
 lib/libkrb/Makefile       |  4 ++--
 lib/libkrb5/Makefile      |  4 ++--
 tools/Makefile.inc        |  4 ++--
 9 files changed, 23 insertions(+), 23 deletions(-)

diffs (196 lines):

diff -r 8198a785c4fe -r 857b1500fbea lib/libasn1/Makefile
--- a/lib/libasn1/Makefile      Wed Oct 31 15:57:49 2001 +0000
+++ b/lib/libasn1/Makefile      Wed Oct 31 16:15:00 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/10/30 09:48:14 jmc Exp $
+# $NetBSD: Makefile,v 1.18 2001/10/31 16:15:00 tv Exp $
 
 .include <bsd.own.mk>
 
@@ -10,7 +10,7 @@
 
 LIB=   asn1
 
-.if !defined(USETOOLS) || (${USETOOLS} == "no")
+.if ${USETOOLS} != "yes"
 COMPILEETOBJ!= cd ${.CURDIR}/../libcom_err/compile_et && ${PRINTOBJDIR}
 COMPILE_ET?=   ${COMPILEETOBJ}/compile_et
 
@@ -115,12 +115,12 @@
 
 CLEANFILES = ${BUILT_SOURCES} ${gen_files} asn1_files krb5_asn1.h krb5_asn1.hx
 
-.if !defined(USETOOLS) || (${USETOOLS} == "no")
+.if ${USETOOLS} != "yes"
 SUBDIR=        asn1_compile
 .endif
 
 .include <bsd.lib.mk>
-.if !defined(USETOOLS) || (${USETOOLS} == "no")
+.if ${USETOOLS} != "yes"
 .include <bsd.subdir.mk>
 .endif
 
diff -r 8198a785c4fe -r 857b1500fbea lib/libcom_err/Makefile
--- a/lib/libcom_err/Makefile   Wed Oct 31 15:57:49 2001 +0000
+++ b/lib/libcom_err/Makefile   Wed Oct 31 16:15:00 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/10/06 21:49:32 perry Exp $
+# $NetBSD: Makefile,v 1.8 2001/10/31 16:15:00 tv Exp $
 
 .include <bsd.own.mk>
 
@@ -13,7 +13,7 @@
 
 INCS=  com_err.h com_right.h
 
-.if !defined(USETOOLS) || (${USETOOLS} == "no")
+.if ${USETOOLS} != "yes"
 .PHONY: compile_et
 
 includes: compile_et
@@ -31,11 +31,11 @@
         -I${DIST}/heimdal/lib/roken            \
         -DHAVE_CONFIG_H
 
-.if !defined(USETOOLS) || (${USETOOLS} == "no")
+.if ${USETOOLS} != "yes"
 SUBDIR=        compile_et
 .endif
 
 .include <bsd.lib.mk>
-.if !defined(USETOOLS) || (${USETOOLS} == "no")
+.if ${USETOOLS} != "yes"
 .include <bsd.subdir.mk>
 .endif
diff -r 8198a785c4fe -r 857b1500fbea lib/libhdb/Makefile
--- a/lib/libhdb/Makefile       Wed Oct 31 15:57:49 2001 +0000
+++ b/lib/libhdb/Makefile       Wed Oct 31 16:15:00 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/10/25 16:15:03 jmc Exp $
+# $NetBSD: Makefile,v 1.12 2001/10/31 16:15:00 tv Exp $
 
 .include <bsd.own.mk>
 
@@ -10,7 +10,7 @@
 
 LIB=   hdb
 
-.if !defined(USETOOLS) || (${USETOOLS} == "no")
+.if ${USETOOLS} != "yes"
 COMPILEETOBJ!= cd ${.CURDIR}/../libcom_err/compile_et && ${PRINTOBJDIR}
 COMPILE_ET=    ${COMPILEETOBJ}/compile_et
 .endif
@@ -43,7 +43,7 @@
 
 INCSDIR= /usr/include/krb5
 
-.if !defined(USETOOLS) || (${USETOOLS} == "no")
+.if ${USETOOLS} != "yes"
 ASN1_COMPILE!= cd ${.CURDIR}/../libasn1/asn1_compile && ${PRINTOBJDIR}
 ASN1_COMPILE:=${ASN1_COMPILE}/asn1_compile
 .endif
diff -r 8198a785c4fe -r 857b1500fbea lib/libkadm/Makefile
--- a/lib/libkadm/Makefile      Wed Oct 31 15:57:49 2001 +0000
+++ b/lib/libkadm/Makefile      Wed Oct 31 16:15:00 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/10/06 21:55:58 perry Exp $
+# $NetBSD: Makefile,v 1.8 2001/10/31 16:15:00 tv Exp $
 
 .include <bsd.own.mk>
 
@@ -10,7 +10,7 @@
 
 LIB=   kadm
 
-.if !defined(USETOOLS) || (${USETOOLS} == "no")
+.if ${USETOOLS} != "yes"
 COMPILEETOBJ!= cd ${.CURDIR}/../libcom_err/compile_et && ${PRINTOBJDIR}
 COMPILE_ET=    ${COMPILEETOBJ}/compile_et
 .endif
diff -r 8198a785c4fe -r 857b1500fbea lib/libkadm5clnt/Makefile
--- a/lib/libkadm5clnt/Makefile Wed Oct 31 15:57:49 2001 +0000
+++ b/lib/libkadm5clnt/Makefile Wed Oct 31 16:15:00 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/10/06 21:55:58 perry Exp $
+# $NetBSD: Makefile,v 1.13 2001/10/31 16:15:01 tv Exp $
 
 .include <bsd.own.mk>
 
@@ -10,7 +10,7 @@
 
 LIB=   kadm5clnt
 
-.if !defined(USETOOLS) || (${USETOOLS} == "no")
+.if ${USETOOLS} != "yes"
 COMPILEETOBJ!= cd ${.CURDIR}/../libcom_err/compile_et && ${PRINTOBJDIR}
 COMPILE_ET=    ${COMPILEETOBJ}/compile_et
 .endif
diff -r 8198a785c4fe -r 857b1500fbea lib/libkadm5srv/Makefile
--- a/lib/libkadm5srv/Makefile  Wed Oct 31 15:57:49 2001 +0000
+++ b/lib/libkadm5srv/Makefile  Wed Oct 31 16:15:00 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/10/06 21:55:58 perry Exp $
+# $NetBSD: Makefile,v 1.13 2001/10/31 16:15:01 tv Exp $
 
 .include <bsd.own.mk>
 
@@ -12,7 +12,7 @@
 
 LIB=   kadm5srv
 
-.if !defined(USETOOLS) || (${USETOOLS} == "no")
+.if ${USETOOLS} != "yes"
 COMPILEETOBJ!= cd ${.CURDIR}/../libcom_err/compile_et && ${PRINTOBJDIR}
 COMPILE_ET=    ${COMPILEETOBJ}/compile_et
 .endif
diff -r 8198a785c4fe -r 857b1500fbea lib/libkrb/Makefile
--- a/lib/libkrb/Makefile       Wed Oct 31 15:57:49 2001 +0000
+++ b/lib/libkrb/Makefile       Wed Oct 31 16:15:00 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/10/06 21:55:59 perry Exp $
+# $NetBSD: Makefile,v 1.15 2001/10/31 16:15:01 tv Exp $
 
 .include <bsd.own.mk>
 
@@ -25,7 +25,7 @@
 
 LIB=   krb
 
-.if !defined(USETOOLS) || (${USETOOLS} == "no")
+.if ${USETOOLS} != "yes"
 COMPILEETOBJ!= cd ${.CURDIR}/../libcom_err/compile_et && ${PRINTOBJDIR}
 COMPILE_ET=    ${COMPILEETOBJ}/compile_et
 .endif
diff -r 8198a785c4fe -r 857b1500fbea lib/libkrb5/Makefile
--- a/lib/libkrb5/Makefile      Wed Oct 31 15:57:49 2001 +0000
+++ b/lib/libkrb5/Makefile      Wed Oct 31 16:15:00 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/10/06 21:52:46 perry Exp $
+# $NetBSD: Makefile,v 1.17 2001/10/31 16:15:01 tv Exp $
 
 .include <bsd.own.mk>
 
@@ -11,7 +11,7 @@
 
 LIB=   krb5
 
-.if !defined(USETOOLS) || (${USETOOLS} == "no")
+.if ${USETOOLS} != "yes"
 COMPILEETOBJ!= cd ${.CURDIR}/../libcom_err/compile_et && ${PRINTOBJDIR}
 COMPILE_ET=    ${COMPILEETOBJ}/compile_et
 .endif
diff -r 8198a785c4fe -r 857b1500fbea tools/Makefile.inc
--- a/tools/Makefile.inc        Wed Oct 31 15:57:49 2001 +0000
+++ b/tools/Makefile.inc        Wed Oct 31 16:15:00 2001 +0000
@@ -1,8 +1,8 @@
-#      $NetBSD: Makefile.inc,v 1.9 2001/10/31 01:20:10 tv Exp $
+#      $NetBSD: Makefile.inc,v 1.10 2001/10/31 16:15:01 tv Exp $
 
 .include <bsd.own.mk>
 
-.if ${USETOOLS} == "no"
+.if ${USETOOLS} != "yes"
 .undef HOSTPROG
 .endif

Prev by Date: [src/trunk]: src * Create a variable HOST_OSTYPE that represents the host bui...
Next by Date: [src/trunk]: src/sys/arch/i386/i386 Fix one more place where we need to resto...
Previous by Thread: [src/trunk]: src * Create a variable HOST_OSTYPE that represents the host bui...
Next by Thread: [src/trunk]: src/sys/arch/i386/i386 Fix one more place where we need to resto...
Indexes:

Home | Main Index | Thread Index | Old Index