aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.in
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in10
1 files changed, 7 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in
index 560752267ab3..8a56756ee14e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.56 2012/05/30 21:54:23 sjg Exp $
# @(#)Makefile 5.2 (Berkeley) 12/28/90
-# $Id: Makefile.in,v 1.161 2012/06/06 20:02:32 sjg Exp $
+# $Id: Makefile.in,v 1.164 2012/06/20 22:44:26 sjg Exp $
PROG= bmake
SRCS= arch.c buf.c compat.c cond.c dir.c for.c hash.c job.c main.c \
@@ -21,7 +21,7 @@ srcdir= @srcdir@
CC?= @CC@
# Base version on src date
-MAKE_VERSION= 20120606
+MAKE_VERSION= 20120620
MACHINE=@machine@
MACHINE_ARCH=@machine_arch@
DEFAULT_SYS_PATH = @default_sys_path@
@@ -40,7 +40,7 @@ SRCS+= ${LIBOBJS:T:.o=.c}
.endif
USE_META ?= @use_meta@
-.if ${USE_META:tl} != "no"
+.if ${USE_META} != "no"
SRCS+= meta.c
CPPFLAGS+= -DUSE_META
FILEMON_H ?= @filemon_h@
@@ -83,9 +83,11 @@ SRCS+= sigcompat.c
CFLAGS+= -DSIGNAL_FLAGS=SA_RESTART
.endif
.endif
+.if defined(.MAKE.LEVEL)
.if make(obj) || make(clean)
SUBDIR+= unit-tests
.endif
+.endif
# many systems use gcc these days
CC_IS_GCC=@GCC@
@@ -132,9 +134,11 @@ _mfromdir=${srcdir}
# sigh, FreeBSD at least includes bsd.subdir.mk via bsd.obj.mk
# so the inclusion below, results in complaints about re-defined
# targets. For NetBSD though we need to explicitly include it.
+.if defined(.MAKE.LEVEL)
.if defined(SUBDIR) && !target(${SUBDIR:[1]})
.-include <bsd.subdir.mk>
.endif
+.endif
CPPFLAGS+= -DMAKE_NATIVE
COPTS.var.c += -Wno-cast-qual