aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.in
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in14
1 files changed, 8 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in
index 8a56756ee14e..5a1f00487299 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.164 2012/06/20 22:44:26 sjg Exp $
+# $Id: Makefile.in,v 1.168 2012/07/05 04:10:23 sjg Exp $
PROG= bmake
SRCS= arch.c buf.c compat.c cond.c dir.c for.c hash.c job.c main.c \
@@ -21,13 +21,15 @@ srcdir= @srcdir@
CC?= @CC@
# Base version on src date
-MAKE_VERSION= 20120620
+MAKE_VERSION= 20120704
MACHINE=@machine@
MACHINE_ARCH=@machine_arch@
DEFAULT_SYS_PATH = @default_sys_path@
+CPPFLAGS+= @CPPFLAGS@
+CFLAGS+= ${CPPFLAGS}
CFLAGS+= -D_PATH_DEFSYSPATH=\"${DEFAULT_SYS_PATH}\"
-CFLAGS+= -I. -I${srcdir} @DEFS@ @CPPFLAGS@ ${XDEFS} -DMAKE_NATIVE
+CFLAGS+= -I. -I${srcdir} @DEFS@ ${XDEFS} -DMAKE_NATIVE
CFLAGS+= ${CFLAGS_${.TARGET:T}}
CFLAGS+= ${COPTS.${.ALLSRC:M*.c:T:u}}
COPTS.main.c+= "-DMAKE_VERSION=\"${MAKE_VERSION}\""
@@ -39,7 +41,7 @@ LDADD= @LIBS@
SRCS+= ${LIBOBJS:T:.o=.c}
.endif
-USE_META ?= @use_meta@
+USE_META = @use_meta@
.if ${USE_META} != "no"
SRCS+= meta.c
CPPFLAGS+= -DUSE_META
@@ -83,7 +85,7 @@ SRCS+= sigcompat.c
CFLAGS+= -DSIGNAL_FLAGS=SA_RESTART
.endif
.endif
-.if defined(.MAKE.LEVEL)
+.if defined(.PARSEDIR)
.if make(obj) || make(clean)
SUBDIR+= unit-tests
.endif
@@ -134,7 +136,7 @@ _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(.PARSEDIR)
.if defined(SUBDIR) && !target(${SUBDIR:[1]})
.-include <bsd.subdir.mk>
.endif