Change the use of formally undocumented features, which have now been
made to fail. Specifically, change .ifdef(SYMBOL) -> .ifdef SYMBOL or .if defined(SYMBOL), and corresponding for .ifndef. Also correct one error in lib/libm/Makefile (.ifdef (${MKCOMPLEX} != "no")?!?).
This commit is contained in:
parent
34052fb508
commit
fddc3457b2
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.88 2008/08/29 00:02:22 gmcgarry Exp $
|
||||
# $NetBSD: Makefile,v 1.89 2009/01/18 20:42:11 he Exp $
|
||||
#
|
||||
# @(#)Makefile 5.1beta 93/09/24
|
||||
#
|
||||
@ -228,7 +228,7 @@ MLINKS+=tanh.3 tanhf.3
|
||||
MLINKS+=round.3 roundf.3
|
||||
MLINKS+=trunc.3 truncf.3
|
||||
|
||||
.ifdef (${MKCOMPLEX} != "no")
|
||||
.if (${MKCOMPLEX} != "no")
|
||||
.include "${.CURDIR}/complex/Makefile.inc"
|
||||
.endif
|
||||
|
||||
|
@ -1,11 +1,11 @@
|
||||
# $NetBSD: Makefile,v 1.94 2009/01/04 18:00:55 pooka Exp $
|
||||
# $NetBSD: Makefile,v 1.95 2009/01/18 20:42:11 he Exp $
|
||||
|
||||
LIB= kern
|
||||
NOPIC= # defined
|
||||
LLIBS= # defined
|
||||
|
||||
.include "Makefile.libkern"
|
||||
.ifndef(ARCHSUBDIR)
|
||||
.ifndef ARCHSUBDIR
|
||||
.BEGIN:
|
||||
@echo no ARCHSUBDIR for ${MACHINE_ARCH} nor ${MACHINE_CPU}
|
||||
@false
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile.rump,v 1.30 2009/01/14 23:22:09 pooka Exp $
|
||||
# $NetBSD: Makefile.rump,v 1.31 2009/01/18 20:42:11 he Exp $
|
||||
#
|
||||
|
||||
WARNS?= 4
|
||||
@ -7,7 +7,7 @@ NOLINT= # kernel code
|
||||
.include <bsd.own.mk>
|
||||
|
||||
# use kernel ABI instead of rump ABI (needs md code)
|
||||
.ifndef(RUMPKMOD)
|
||||
.ifndef RUMPKMOD
|
||||
CPPFLAGS:= -I${RUMPTOP}/include ${CPPFLAGS}
|
||||
.endif
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile.rumpkern,v 1.37 2009/01/14 23:22:09 pooka Exp $
|
||||
# $NetBSD: Makefile.rumpkern,v 1.38 2009/01/18 20:42:11 he Exp $
|
||||
#
|
||||
|
||||
.include "${RUMPTOP}/Makefile.rump"
|
||||
@ -70,7 +70,7 @@ AFLAGS+= -D_LOCORE -Wa,-fatal-warnings
|
||||
# the kernel of our compat target (amd64->i386 & sparc64->sparc), so
|
||||
# take MD stuff from the right arch.
|
||||
#
|
||||
.ifdef(LD32DIR)
|
||||
.ifdef LD32DIR
|
||||
ARCHDIR= ${RUMPTOP}/librump/rumpkern/arch/${LD32DIR}
|
||||
LIBKERN_ARCH= ${LD32DIR}
|
||||
.else
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile.inc,v 1.9 2009/01/08 18:43:28 pooka Exp $
|
||||
# $NetBSD: Makefile.inc,v 1.10 2009/01/18 20:42:11 he Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
.include <bsd.sys.mk>
|
||||
@ -9,8 +9,8 @@ USE_FORT?= yes # network client
|
||||
.include "${.CURDIR}/../../Makefile.inc"
|
||||
.endif
|
||||
|
||||
.ifdef(ISRUMP)
|
||||
.ifdef(MOUNTNAME)
|
||||
.ifdef ISRUMP
|
||||
.ifdef MOUNTNAME
|
||||
PROG= rump_${MOUNTNAME}
|
||||
MAN= rump_${MOUNTNAME}.8
|
||||
|
||||
@ -23,7 +23,7 @@ SRCS+= mount_${MOUNTNAME}.c rump_${MOUNTNAME}.c pathadj.c fattr.c
|
||||
# on select archs use the kernel module directly, otherwise fallback
|
||||
# to the rump library
|
||||
.undef RUMPKMOD
|
||||
.ifdef(RUMPKMOD)
|
||||
.ifdef RUMPKMOD
|
||||
OSRELEASE!= ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh
|
||||
KMODULEDIR= ${DESTDIR}/stand/${MACHINE}/${OSRELEASE}/modules/${MOUNTNAME}
|
||||
LDADD+= ${KMODULEDIR}/${MOUNTNAME}.kmod
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.2 2008/12/30 22:20:56 pooka Exp $
|
||||
# $NetBSD: Makefile,v 1.3 2009/01/18 20:42:11 he Exp $
|
||||
#
|
||||
|
||||
.include <bsd.own.mk>
|
||||
@ -12,7 +12,7 @@ SRCS+= getnfsargs.c
|
||||
# second one runs the real NetBSD kernel networking stack in userspace
|
||||
# and uses /dev/tap to access the network.
|
||||
#
|
||||
.ifdef(RUMPKMOD)
|
||||
.ifdef RUMPKMOD
|
||||
LDADD+= -lrumpnet -lrumpnet_sockin
|
||||
.else
|
||||
LDADD+= -lrumpfs_nfs -lrumpnet -lrumpnet_sockin
|
||||
|
Loading…
Reference in New Issue
Block a user