summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/arch/hppa/stand/Makefile.inc4
-rw-r--r--sys/arch/hppa64/stand/Makefile.inc4
-rw-r--r--sys/arch/i386/stand/Makefile.inc4
-rw-r--r--sys/arch/landisk/stand/Makefile.inc4
-rw-r--r--sys/arch/macppc/stand/Makefile.inc4
-rw-r--r--sys/arch/mvme68k/stand/libsa/Makefile28
-rw-r--r--sys/arch/mvme88k/stand/libsa/Makefile17
-rw-r--r--sys/arch/mvmeppc/stand/libsa/Makefile17
-rw-r--r--sys/arch/sgi/stand/boot/Makefile4
-rw-r--r--sys/arch/sgi/stand/libsa/Makefile4
-rw-r--r--sys/arch/sparc64/stand/Makefile.inc4
-rw-r--r--sys/arch/sparc64/stand/bootblk/Makefile4
-rw-r--r--sys/arch/sparc64/stand/libsa/Makefile4
-rw-r--r--sys/arch/sparc64/stand/ofwboot/Makefile4
-rw-r--r--sys/arch/zaurus/stand/zboot/Makefile4
15 files changed, 45 insertions, 65 deletions
diff --git a/sys/arch/hppa/stand/Makefile.inc b/sys/arch/hppa/stand/Makefile.inc
index 30b28d0a0ed..e4a32b0bf65 100644
--- a/sys/arch/hppa/stand/Makefile.inc
+++ b/sys/arch/hppa/stand/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.15 2007/11/26 10:01:42 deraadt Exp $
+# $OpenBSD: Makefile.inc,v 1.16 2007/11/26 10:26:02 deraadt Exp $
CFLAGS=${DEBUG} -Os -Wall -Werror
CPPFLAGS+=-I${S} -I. -I${.CURDIR}
@@ -16,7 +16,7 @@ HEAP_LIMIT=0x7f8000
CLEANFILES+= machine
DEBUGLIBS= no
-.if !make(libdep) && !make(sadep) && !make(salibdir) && !make(kernlibdir) && !make(obj) && !(defined(PROG) && ${PROG} == "mkboot")
+.if !make(libdep) && !make(sadep) && !make(salibdir) && !make(obj) && !(defined(PROG) && ${PROG} == "mkboot")
.BEGIN:
@([ -h machine ] || ln -s $(S)/arch/hppa/include machine)
.endif
diff --git a/sys/arch/hppa64/stand/Makefile.inc b/sys/arch/hppa64/stand/Makefile.inc
index feb38266a32..7818b6a02d8 100644
--- a/sys/arch/hppa64/stand/Makefile.inc
+++ b/sys/arch/hppa64/stand/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.3 2007/11/26 10:01:42 deraadt Exp $
+# $OpenBSD: Makefile.inc,v 1.4 2007/11/26 10:26:02 deraadt Exp $
CFLAGS=${DEBUG} -Os -Wall -Werror
CPPFLAGS+=-I${S} -I. -I${.CURDIR}
@@ -15,7 +15,7 @@ HEAP_LIMIT=0x7f8000
CLEANFILES+= machine
DEBUGLIBS= no
-.if !make(libdep) && !make(sadep) && !make(salibdir) && !make(kernlibdir) && !make(obj) && !(defined(PROG) && ${PROG} == "mkboot")
+.if !make(libdep) && !make(sadep) && !make(salibdir) && !make(obj) && !(defined(PROG) && ${PROG} == "mkboot")
.BEGIN:
@([ -h machine ] || ln -s $(S)/arch/hppa64/include machine)
.endif
diff --git a/sys/arch/i386/stand/Makefile.inc b/sys/arch/i386/stand/Makefile.inc
index d17962786f7..1cbd414aeb0 100644
--- a/sys/arch/i386/stand/Makefile.inc
+++ b/sys/arch/i386/stand/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.39 2007/11/26 10:01:42 deraadt Exp $
+# $OpenBSD: Makefile.inc,v 1.40 2007/11/26 10:26:02 deraadt Exp $
CFLAGS=${DEBUG} ${COPTS} -Os -Wall -Werror
CFLAGS+= -fno-stack-protector
@@ -27,7 +27,7 @@ CLEANFILES+= machine
SACFLAGS+=-nostdinc -fno-builtin -fpack-struct
.endif
-.if !make(libdep) && !make(sadep) && !make(salibdir) && !make(kernlibdir) && !make(obj)
+.if !make(libdep) && !make(sadep) && !make(salibdir) && !make(obj)
.BEGIN:
@([ X$(S) = X -o -h machine ] || ln -s $(S)/arch/i386/include machine)
.endif
diff --git a/sys/arch/landisk/stand/Makefile.inc b/sys/arch/landisk/stand/Makefile.inc
index f46fde8c38a..7b3c84442ff 100644
--- a/sys/arch/landisk/stand/Makefile.inc
+++ b/sys/arch/landisk/stand/Makefile.inc
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile.inc,v 1.1 2006/10/06 21:48:50 mickey Exp $
+# $OpenBSD: Makefile.inc,v 1.2 2007/11/26 10:26:02 deraadt Exp $
-.if !make(libdep) && !make(sadep) && !make(salibdir) && !make(kernlibdir) && !make(obj) && !make(clean) && !make(cleandir)
+.if !make(libdep) && !make(sadep) && !make(salibdir) && !make(obj) && !make(clean) && !make(cleandir)
.BEGIN:
@([ X$(S) = X -o -h machine ] || ln -s $(S)/arch/landisk/include machine)
@([ X$(S) = X -o -h sh ] || ln -s $(S)/arch/sh/include sh)
diff --git a/sys/arch/macppc/stand/Makefile.inc b/sys/arch/macppc/stand/Makefile.inc
index 4dafdde6a21..7d55f0d4675 100644
--- a/sys/arch/macppc/stand/Makefile.inc
+++ b/sys/arch/macppc/stand/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.7 2005/12/30 02:03:49 millert Exp $
+# $OpenBSD: Makefile.inc,v 1.8 2007/11/26 10:26:02 deraadt Exp $
# $NetBSD: Makefile.inc,v 1.1 1996/09/30 16:34:59 ws Exp $
.if !defined(__stand_makefile_inc)
@@ -8,7 +8,7 @@ KERN_AS= library
S=$(.CURDIR)/../../../$(R)
-.if !make(libdep) && !make(sadep) && !make(salibdir) && !make(kernlibdir) && !make(obj) && !defined(NOMACHINE)
+.if !make(libdep) && !make(sadep) && !make(salibdir) && !make(obj) && !defined(NOMACHINE)
.BEGIN:
@([ -h machine ] || ln -s $(S)/arch/$(MACHINE)/include machine)
.endif
diff --git a/sys/arch/mvme68k/stand/libsa/Makefile b/sys/arch/mvme68k/stand/libsa/Makefile
index a659abc2e3e..2f31af438d0 100644
--- a/sys/arch/mvme68k/stand/libsa/Makefile
+++ b/sys/arch/mvme68k/stand/libsa/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.18 2007/11/26 10:01:42 deraadt Exp $
+# $OpenBSD: Makefile,v 1.19 2007/11/26 10:26:02 deraadt Exp $
LIB=sa
-CLEANFILES+=SRT0.o
+CLEANFILES+=SRT0.o
NOPIC=nopic
NOPROFILE=noprofile
@@ -10,25 +10,17 @@ NOPROFILE=noprofile
# Logically src/sys
S=${.CURDIR}/../../../..
-SRC_net= arp.c ether.c in_cksum.c net.c netif.c rpc.c nfs.c \
- rarp.c bootparam.c
+SRCS+= bugdev.c clock.c parse_args.c exec_mvme.c
.PATH: $S/lib/libsa
-SRC_sa= alloc.c memcpy.c exit.c getfile.c gets.c globals.c \
- printf.c strerror.c memset.c memcmp.c strncpy.c strcmp.c strlen.c \
- snprintf.c \
- close.c closeall.c dev.c dkcksum.c \
- lseek.c open.c nullfs.c read.c fstat.c \
- ufs.c cread.c
+SRCs+= alloc.c memcpy.c exit.c getfile.c gets.c globals.c printf.c \
+ strerror.c memset.c memcmp.c strncpy.c strcmp.c strlen.c \
+ snprintf.c close.c closeall.c dev.c dkcksum.c lseek.c open.c \
+ nullfs.c read.c fstat.c ufs.c cread.c
+SRCS+= arp.c ether.c in_cksum.c net.c netif.c rpc.c nfs.c rarp.c bootparam.c
.PATH: ${S}/lib/libkern/arch/m68k ${S}/lib/libkern
-SRC_kern= ashrdi3.c
-
-SRC_mvme= exec_mvme.c
-
-SRC_here= bugdev.c clock.c parse_args.c
-
-SRCS= ${SRC_net} ${SRC_sa} ${SRC_mvme} ${SRC_here} ${SRC_kern}
+SRCS+= ashrdi3.c
# DBG= -DDEBUG -DNETIF_DEBUG -DNFS_DEBUG -DRPC_DEBUG \
# -DNET_DEBUG -DRARP_DEBUG -DETHER_DEBUG
@@ -38,7 +30,7 @@ DEFS= -D__INTERNAL_LIBSA_CREAD
INCL= -I${.CURDIR} -I${.CURDIR}/../libbug -I${S}/lib/libsa -I${S}
CFLAGS+= ${XCFLAGS} -O2 ${COPTS} ${DEFS} ${DBG} ${INCL}
-all: libsa.a SRT0.o
+all: libsa.a SRT0.o
install:
diff --git a/sys/arch/mvme88k/stand/libsa/Makefile b/sys/arch/mvme88k/stand/libsa/Makefile
index ed0aab2baa5..3ef8ae12bd8 100644
--- a/sys/arch/mvme88k/stand/libsa/Makefile
+++ b/sys/arch/mvme88k/stand/libsa/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2007/11/26 10:01:42 deraadt Exp $
+# $OpenBSD: Makefile,v 1.9 2007/11/26 10:26:02 deraadt Exp $
LIB=sa
@@ -8,25 +8,20 @@ NOPROFILE=noprofile
# Logically src/sys
S=${.CURDIR}/../../../..
-SRC_net= arp.c ether.c in_cksum.c net.c netif.c rpc.c nfs.c \
- rarp.c bootparam.c
+SRCS= bugdev.c clock.c parse_args.c exec_mvme.c
.PATH: ${S}/lib/libsa
-SRC_sa= alloc.c memcpy.c exit.c getfile.c gets.c globals.c \
+SRCS+= alloc.c memcpy.c exit.c getfile.c gets.c globals.c \
printf.c strerror.c memset.c memcmp.c strncpy.c strcmp.c strlen.c \
strlcpy.c strlcat.c snprintf.c \
close.c closeall.c dev.c dkcksum.c \
lseek.c open.c nullfs.c read.c fstat.c \
ufs.c cread.c
+SRCS+= arp.c ether.c in_cksum.c net.c netif.c rpc.c nfs.c \
+ rarp.c bootparam.c
.PATH: ${S}/lib/libkern/arch/m88k ${S}/lib/libkern
-SRC_kern= ashrdi3.c bzero.c
-
-SRC_mvme= exec_mvme.c
-
-SRC_here= bugdev.c clock.c parse_args.c
-
-SRCS= ${SRC_net} ${SRC_sa} ${SRC_mvme} ${SRC_here} ${SRC_kern}
+SRCS+= ashrdi3.c bzero.c
# DBG= -DDEBUG -DNETIF_DEBUG -DNFS_DEBUG -DRPC_DEBUG \
# -DNET_DEBUG -DRARP_DEBUG -DETHER_DEBUG
diff --git a/sys/arch/mvmeppc/stand/libsa/Makefile b/sys/arch/mvmeppc/stand/libsa/Makefile
index 69f4503b63f..335177bc4a6 100644
--- a/sys/arch/mvmeppc/stand/libsa/Makefile
+++ b/sys/arch/mvmeppc/stand/libsa/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2007/11/26 10:01:42 deraadt Exp $
+# $OpenBSD: Makefile,v 1.8 2007/11/26 10:26:02 deraadt Exp $
LIB=sa
@@ -8,25 +8,20 @@ NOPROFILE=noprofile
# Logically src/sys
S=${.CURDIR}/../../../..
-SRC_net= arp.c ether.c in_cksum.c net.c netif.c rpc.c nfs.c \
- rarp.c bootparam.c
+SRCS= bugdev.c clock.c conf.c parse_args.c rawfs.c tftpfs.c exec_mvme.c
.PATH: ${S}/lib/libsa
-SRC_sa= alloc.c memcpy.c exit.c getfile.c gets.c globals.c \
+SRCS+= alloc.c memcpy.c exit.c getfile.c gets.c globals.c \
printf.c strerror.c memset.c memcmp.c strncpy.c strcmp.c strlen.c \
strlcpy.c strlcat.c snprintf.c \
close.c closeall.c dev.c disklabel.c dkcksum.c \
lseek.c open.c nullfs.c read.c fstat.c \
ufs.c cread.c loadfile.c
+SRCS+= arp.c ether.c in_cksum.c net.c netif.c rpc.c nfs.c \
+ rarp.c bootparam.c
.PATH: ${S}/lib/libkern/arch/m88k ${S}/lib/libkern
-SRC_kern= ashrdi3.c bzero.c
-
-SRC_mvme= exec_mvme.c
-
-SRC_here= bugdev.c clock.c conf.c parse_args.c rawfs.c tftpfs.c
-
-SRCS= ${SRC_net} ${SRC_sa} ${SRC_mvme} ${SRC_here} ${SRC_kern}
+SRCS+= ashrdi3.c bzero.c
# DBG= -DDEBUG -DNETIF_DEBUG -DNFS_DEBUG -DRPC_DEBUG \
# -DNET_DEBUG -DRARP_DEBUG -DETHER_DEBUG
diff --git a/sys/arch/sgi/stand/boot/Makefile b/sys/arch/sgi/stand/boot/Makefile
index 6d4be9b4d82..a447774389d 100644
--- a/sys/arch/sgi/stand/boot/Makefile
+++ b/sys/arch/sgi/stand/boot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2007/11/25 18:25:32 deraadt Exp $
+# $OpenBSD: Makefile,v 1.7 2007/11/26 10:26:02 deraadt Exp $
PROG= boot
@@ -21,7 +21,7 @@ CLEANFILES+= machine mips64
.PATH: ${S}/lib/libkern/arch/mips64 ${S}/lib/libkern
SRCS+= strlcpy.c memcpy.c strlen.c strrchr.c strlcat.c ashrdi3.c
-.if !make(libdep) && !make(sadep) && !make(salibdir) && !make(kernlibdir) && !make(obj)
+.if !make(libdep) && !make(sadep) && !make(salibdir) && !make(obj)
.BEGIN:
@([ -h machine ] || ln -s ${.CURDIR}/../../include machine)
@([ -h mips64 ] || ln -s ${.CURDIR}/../../../mips64/include mips64)
diff --git a/sys/arch/sgi/stand/libsa/Makefile b/sys/arch/sgi/stand/libsa/Makefile
index d182a97295e..5553f38896a 100644
--- a/sys/arch/sgi/stand/libsa/Makefile
+++ b/sys/arch/sgi/stand/libsa/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2004/09/22 22:06:18 miod Exp $
+# $OpenBSD: Makefile,v 1.4 2007/11/26 10:26:02 deraadt Exp $
LIB= sa
@@ -31,7 +31,7 @@ ${OBJS}: ${.CURDIR}/../Makefile.inc
NOPROFILE=
NOPIC=
-.if !make(libdep) && !make(sadep) && !make(salibdir) && !make(kernlibdir) && !make(obj)
+.if !make(libdep) && !make(sadep) && !make(salibdir) && !make(obj)
.BEGIN:
@([ -h machine ] || ln -s ${.CURDIR}/../../include machine)
@([ -h mips64 ] || ln -s ${.CURDIR}/../../../mips64/include mips64)
diff --git a/sys/arch/sparc64/stand/Makefile.inc b/sys/arch/sparc64/stand/Makefile.inc
index f8aa7985fa6..d79ce2579bc 100644
--- a/sys/arch/sparc64/stand/Makefile.inc
+++ b/sys/arch/sparc64/stand/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.7 2007/11/25 18:25:33 deraadt Exp $
+# $OpenBSD: Makefile.inc,v 1.8 2007/11/26 10:26:02 deraadt Exp $
# $NetBSD: Makefile.inc,v 1.7 2000/08/20 14:57:16 mrg Exp $
.ifndef __INCLUDED_STAND_MAKEFILE_INC
@@ -20,8 +20,6 @@ CFLAGS+= -msoft-float
CFLAGS+= -fno-builtin-vprintf -fno-builtin-printf -fno-builtin-putchar
.endif
-
-
### Figure out what to use for libsa
LIBSADIR= ${.CURDIR}/../libsa
diff --git a/sys/arch/sparc64/stand/bootblk/Makefile b/sys/arch/sparc64/stand/bootblk/Makefile
index 6381b6c4906..f0a8c095059 100644
--- a/sys/arch/sparc64/stand/bootblk/Makefile
+++ b/sys/arch/sparc64/stand/bootblk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2001/10/08 22:19:38 jason Exp $
+# $OpenBSD: Makefile,v 1.7 2007/11/26 10:26:03 deraadt Exp $
# $NetBSD: Makefile,v 1.1 2000/08/20 14:58:45 mrg Exp $
CURDIR= ${.CURDIR}
@@ -27,7 +27,7 @@ SVR4=-U__SVR4 -U__svr4__ -D__NetBSD__
INCLUDES= -I. -I$S/arch -I$S -nostdinc
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_LKM ${SVR4}
-.if !make(libdep) && !make(sadep) && !make(salibdir) && !make(kernlibdir) && !make(obj)
+.if !make(libdep) && !make(sadep) && !make(salibdir) && !make(obj)
.BEGIN:
@([ -h machine ] || ln -s ${.CURDIR}/../../include machine)
.endif
diff --git a/sys/arch/sparc64/stand/libsa/Makefile b/sys/arch/sparc64/stand/libsa/Makefile
index fd55dd6063f..a0a196a9cb8 100644
--- a/sys/arch/sparc64/stand/libsa/Makefile
+++ b/sys/arch/sparc64/stand/libsa/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2003/06/01 17:00:40 deraadt Exp $
+# $OpenBSD: Makefile,v 1.6 2007/11/26 10:26:03 deraadt Exp $
LIB= sa
@@ -36,7 +36,7 @@ ${OBJS}: ${.CURDIR}/../Makefile.inc
NOPROFILE=
NOPIC=
-.if !make(libdep) && !make(sadep) && !make(salibdir) && !make(kernlibdir) && !make(obj)
+.if !make(libdep) && !make(sadep) && !make(salibdir) && !make(obj)
.BEGIN:
@([ -h machine ] || ln -s ${.CURDIR}/../../include machine)
.endif
diff --git a/sys/arch/sparc64/stand/ofwboot/Makefile b/sys/arch/sparc64/stand/ofwboot/Makefile
index e10c59285b3..fb4d016635c 100644
--- a/sys/arch/sparc64/stand/ofwboot/Makefile
+++ b/sys/arch/sparc64/stand/ofwboot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2007/11/25 18:25:33 deraadt Exp $
+# $OpenBSD: Makefile,v 1.12 2007/11/26 10:26:03 deraadt Exp $
# $NetBSD: Makefile,v 1.2 2001/03/04 14:50:05 mrg Exp $
CURDIR= ${.CURDIR}
@@ -53,7 +53,7 @@ CPPFLAGS+= -DSPARC_BOOT_UFS
CPPFLAGS+= -DSPARC_BOOT_NFS
#CPPFLAGS+= -DSPARC_BOOT_HSFS
-.if !make(libdep) && !make(sadep) && !make(salibdir) && !make(kernlibdir) && !make(obj)
+.if !make(libdep) && !make(sadep) && !make(salibdir) && !make(obj)
.BEGIN:
@([ -h machine ] || ln -s ${.CURDIR}/../../include machine)
.endif
diff --git a/sys/arch/zaurus/stand/zboot/Makefile b/sys/arch/zaurus/stand/zboot/Makefile
index de807b3e8d7..ade914bf559 100644
--- a/sys/arch/zaurus/stand/zboot/Makefile
+++ b/sys/arch/zaurus/stand/zboot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2007/11/25 18:25:33 deraadt Exp $
+# $OpenBSD: Makefile,v 1.9 2007/11/26 10:26:03 deraadt Exp $
MAN= boot.8
MANSUBDIR=zaurus
@@ -14,7 +14,7 @@ SRCS= crt0.c
S= ${.CURDIR}/../../../..
CLEANFILES+= arm machine
-.if !make(libdep) && !make(sadep) && !make(salibdir) && !make(kernlibdir) && !make(obj)
+.if !make(libdep) && !make(sadep) && !make(salibdir) && !make(obj)
.BEGIN:
@([ X$(S) = X -o -h arm ] || ln -s $(S)/arch/arm/include arm)
@([ X$(S) = X -o -h machine ] || ln -s $(S)/arch/zaurus/include machine)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 00:16:04 +0000