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").
This commit is contained in:
tv 2001-10-31 16:15:00 +00:00
parent c0c91b1b74
commit dd7ca02987
9 changed files with 23 additions and 23 deletions

View File

@ -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 @@ MKLINT= no
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 @@ ${SRCS}: krb5_asn1.h
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

View File

@ -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 @@ SRCS= error.c com_err.c roken_rename.h
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 @@ CPPFLAGS+= -I. \
-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

View File

@ -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 @@ MKLINT= no
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 @@ INCS= hdb.h hdb_err.h hdb_asn1.h hdb-protos.h hdb-private.h
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

View File

@ -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 @@ MKLINT= no
LIB= kadm
.if !defined(USETOOLS) || (${USETOOLS} == "no")
.if ${USETOOLS} != "yes"
COMPILEETOBJ!= cd ${.CURDIR}/../libcom_err/compile_et && ${PRINTOBJDIR}
COMPILE_ET= ${COMPILEETOBJ}/compile_et
.endif

View File

@ -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 @@ MKLINT= no
LIB= kadm5clnt
.if !defined(USETOOLS) || (${USETOOLS} == "no")
.if ${USETOOLS} != "yes"
COMPILEETOBJ!= cd ${.CURDIR}/../libcom_err/compile_et && ${PRINTOBJDIR}
COMPILE_ET= ${COMPILEETOBJ}/compile_et
.endif

View File

@ -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 @@ MKLINT= no
LIB= kadm5srv
.if !defined(USETOOLS) || (${USETOOLS} == "no")
.if ${USETOOLS} != "yes"
COMPILEETOBJ!= cd ${.CURDIR}/../libcom_err/compile_et && ${PRINTOBJDIR}
COMPILE_ET= ${COMPILEETOBJ}/compile_et
.endif

View File

@ -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 @@ MKLINT= no
LIB= krb
.if !defined(USETOOLS) || (${USETOOLS} == "no")
.if ${USETOOLS} != "yes"
COMPILEETOBJ!= cd ${.CURDIR}/../libcom_err/compile_et && ${PRINTOBJDIR}
COMPILE_ET= ${COMPILEETOBJ}/compile_et
.endif

View File

@ -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 @@ MKLINT= no
LIB= krb5
.if !defined(USETOOLS) || (${USETOOLS} == "no")
.if ${USETOOLS} != "yes"
COMPILEETOBJ!= cd ${.CURDIR}/../libcom_err/compile_et && ${PRINTOBJDIR}
COMPILE_ET= ${COMPILEETOBJ}/compile_et
.endif

View File

@ -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