summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/aviion/stand/libsa/Makefile8
-rw-r--r--sys/arch/hp300/stand/Makefile4
-rw-r--r--sys/arch/hp300/stand/Makefile.inc15
-rw-r--r--sys/arch/hp300/stand/cdboot/Makefile4
-rw-r--r--sys/arch/hp300/stand/uboot/Makefile4
-rw-r--r--sys/arch/hppa/stand/Makefile.inc7
-rw-r--r--sys/arch/hppa64/stand/Makefile4
-rw-r--r--sys/arch/hppa64/stand/Makefile.inc7
-rw-r--r--sys/arch/i386/stand/Makefile.inc7
-rw-r--r--sys/arch/mvme68k/stand/libsa/Makefile8
-rw-r--r--sys/arch/mvme88k/stand/libsa/Makefile8
-rw-r--r--sys/arch/mvmeppc/stand/libsa/Makefile8
-rw-r--r--sys/arch/sgi/stand/Makefile.inc17
13 files changed, 26 insertions, 75 deletions
diff --git a/sys/arch/aviion/stand/libsa/Makefile b/sys/arch/aviion/stand/libsa/Makefile
index 81f62fb4ec2..2dc4e5d7d53 100644
--- a/sys/arch/aviion/stand/libsa/Makefile
+++ b/sys/arch/aviion/stand/libsa/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2006/05/16 22:48:18 miod Exp $
+# $OpenBSD: Makefile,v 1.2 2007/11/26 10:01:42 deraadt Exp $
LIB=sa
@@ -8,7 +8,6 @@ NOPROFILE=noprofile
# Logically src/sys
S=${.CURDIR}/../../../..
DIR_SA=$S/lib/libsa
-DIR_KERN=$S/lib/libkern
SRC_net= arp.c ether.c in_cksum.c net.c netif.c rpc.c nfs.c \
rarp.c bootparam.c
@@ -20,13 +19,14 @@ SRC_sa= alloc.c memcpy.c exit.c getfile.c gets.c globals.c \
lseek.c open.c nullfs.c read.c fstat.c \
ufs.c cread.c
-SRC_kern= ashrdi3.c bzero.c
+.PATH: ${S}/lib/libkern/arch/m88k ${S}/lib/libkern
+SRCS+= ashrdi3.c bzero.c
SRC_aviion= exec_aout.c
SRC_here= clock.c parse_args.c
-SRCS= ${SRC_net} ${SRC_sa} ${SRC_aviion} ${SRC_here} ${SRC_kern}
+SRCS+= ${SRC_net} ${SRC_sa} ${SRC_aviion} ${SRC_here}
# DBG= -DDEBUG -DNETIF_DEBUG -DNFS_DEBUG -DRPC_DEBUG \
# -DNET_DEBUG -DRARP_DEBUG -DETHER_DEBUG
diff --git a/sys/arch/hp300/stand/Makefile b/sys/arch/hp300/stand/Makefile
index 5fb8612fa55..4a93dba19f4 100644
--- a/sys/arch/hp300/stand/Makefile
+++ b/sys/arch/hp300/stand/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.17 2000/05/25 21:54:43 deraadt Exp $
+# $OpenBSD: Makefile,v 1.18 2007/11/26 10:01:42 deraadt Exp $
# $NetBSD: Makefile,v 1.23 1997/02/04 03:51:37 thorpej Exp $
.if ${MACHINE} == "hp300"
-SUBDIR= libsa libsaz libkern libz common mkboot uboot cdboot installboot
+SUBDIR= libsa libsaz libz common mkboot uboot cdboot installboot
.endif
.include <bsd.subdir.mk>
diff --git a/sys/arch/hp300/stand/Makefile.inc b/sys/arch/hp300/stand/Makefile.inc
index f4462bca588..3bd8f37a9e9 100644
--- a/sys/arch/hp300/stand/Makefile.inc
+++ b/sys/arch/hp300/stand/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.8 2006/08/17 06:31:08 miod Exp $
+# $OpenBSD: Makefile.inc,v 1.9 2007/11/26 10:01:42 deraadt Exp $
# $NetBSD: Makefile.inc,v 1.7 1997/05/12 07:43:18 thorpej Exp $
BINDIR= /usr/mdec
@@ -31,19 +31,6 @@ COMMONOBJDIR= ${COMMONDIR}
LIBCOMMON= ${COMMONOBJDIR}/libcommon.a
-### Figure out what to use for libkern
-LIBKERNDIR= ${.CURDIR}/../libkern
-
-.if exists(${LIBKERNDIR}/obj.${MACHINE})
-LIBKERNOBJDIR= ${LIBKERNDIR}/obj.${MACHINE}
-.elif exists(${LIBKERNDIR}/obj)
-LIBKERNOBJDIR= ${LIBKERNDIR}/obj
-.else
-LIBKERNOBJDIR= ${LIBKERNDIR}
-.endif
-
-LIBKERN= ${LIBKERNOBJDIR}/libkern.a
-
### Figure out what to use for libsa
LIBSADIR= ${.CURDIR}/../libsa
diff --git a/sys/arch/hp300/stand/cdboot/Makefile b/sys/arch/hp300/stand/cdboot/Makefile
index 118cc95f9c9..5c27917e7a8 100644
--- a/sys/arch/hp300/stand/cdboot/Makefile
+++ b/sys/arch/hp300/stand/cdboot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2006/08/17 06:31:10 miod Exp $
+# $OpenBSD: Makefile,v 1.5 2007/11/26 10:01:42 deraadt Exp $
PROG= cdboot
@@ -18,7 +18,7 @@ AFLAGS= -x assembler-with-cpp -traditional-cpp -I${.CURDIR}/../include \
SRCS= srt0.S cdboot.c clock.c conf.c cons.c devopen.c
-LIBS= ${LIBCOMMON} ${LIBSA} ${LIBZ} ${LIBKERN}
+LIBS= ${LIBCOMMON} ${LIBSA} ${LIBZ}
CLEANFILES+= cdboot.lif
diff --git a/sys/arch/hp300/stand/uboot/Makefile b/sys/arch/hp300/stand/uboot/Makefile
index 74d94bb3077..6a13d9566e6 100644
--- a/sys/arch/hp300/stand/uboot/Makefile
+++ b/sys/arch/hp300/stand/uboot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2006/08/17 06:31:10 miod Exp $
+# $OpenBSD: Makefile,v 1.6 2007/11/26 10:01:42 deraadt Exp $
PROG= uboot
@@ -16,7 +16,7 @@ AFLAGS= -x assembler-with-cpp -traditional-cpp -I${.CURDIR}/../include \
SRCS= srt0.S uboot.c tgets.c netio.c clock.c conf.c prf.c
-LIBS= ${LIBCOMMON} ${LIBSAZ} ${LIBZ} ${LIBKERN}
+LIBS= ${LIBCOMMON} ${LIBSAZ} ${LIBZ}
CLEANFILES+= uboot.lif
diff --git a/sys/arch/hppa/stand/Makefile.inc b/sys/arch/hppa/stand/Makefile.inc
index 2ff005d2bf4..30b28d0a0ed 100644
--- a/sys/arch/hppa/stand/Makefile.inc
+++ b/sys/arch/hppa/stand/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.14 2005/12/30 02:03:49 millert Exp $
+# $OpenBSD: Makefile.inc,v 1.15 2007/11/26 10:01:42 deraadt Exp $
CFLAGS=${DEBUG} -Os -Wall -Werror
CPPFLAGS+=-I${S} -I. -I${.CURDIR}
@@ -26,11 +26,6 @@ LIBSA=${STANDIR}/libsa/libsa.a
.else
LIBSA=${STANDIR}/libsa/${__objdir}/libsa.a
.endif
-.if exists(${STANDIR}/libkern/libkern.a)
-LIBKERN=${STANDIR}/libkern/libkern.a
-.else
-LIBKERN=${STANDIR}/libkern/${__objdir}/libkern.a
-.endif
.if exists(${STANDIR}/libz/libz.a)
LIBZ=${STANDIR}/libz/libz.a
.else
diff --git a/sys/arch/hppa64/stand/Makefile b/sys/arch/hppa64/stand/Makefile
index 296da014aa6..782d1308b4f 100644
--- a/sys/arch/hppa64/stand/Makefile
+++ b/sys/arch/hppa64/stand/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.1 2005/04/01 10:40:48 mickey Exp $
+# $OpenBSD: Makefile,v 1.2 2007/11/26 10:01:42 deraadt Exp $
.if ${MACHINE} == "hppa64"
-SUBDIR= libsa libkern libz
+SUBDIR= libsa libz
.endif
SUBDIR+= mkboot boot
.if ${MACHINE} == "hppa64"
diff --git a/sys/arch/hppa64/stand/Makefile.inc b/sys/arch/hppa64/stand/Makefile.inc
index 1f5276217aa..feb38266a32 100644
--- a/sys/arch/hppa64/stand/Makefile.inc
+++ b/sys/arch/hppa64/stand/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.2 2005/12/30 02:03:48 millert Exp $
+# $OpenBSD: Makefile.inc,v 1.3 2007/11/26 10:01:42 deraadt Exp $
CFLAGS=${DEBUG} -Os -Wall -Werror
CPPFLAGS+=-I${S} -I. -I${.CURDIR}
@@ -25,11 +25,6 @@ LIBSA=${STANDIR}/libsa/libsa.a
.else
LIBSA=${STANDIR}/libsa/${__objdir}/libsa.a
.endif
-.if exists(${STANDIR}/libkern/libkern.a)
-LIBKERN=${STANDIR}/libkern/libkern.a
-.else
-LIBKERN=${STANDIR}/libkern/${__objdir}/libkern.a
-.endif
.if exists(${STANDIR}/libz/libz.a)
LIBZ=${STANDIR}/libz/libz.a
.else
diff --git a/sys/arch/i386/stand/Makefile.inc b/sys/arch/i386/stand/Makefile.inc
index acba2b834f6..d17962786f7 100644
--- a/sys/arch/i386/stand/Makefile.inc
+++ b/sys/arch/i386/stand/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.38 2005/12/30 02:03:49 millert Exp $
+# $OpenBSD: Makefile.inc,v 1.39 2007/11/26 10:01:42 deraadt Exp $
CFLAGS=${DEBUG} ${COPTS} -Os -Wall -Werror
CFLAGS+= -fno-stack-protector
@@ -43,11 +43,6 @@ LIBSA=${SADIR}/libsa/libsa.a
.else
LIBSA=${SADIR}/libsa/${__objdir}/libsa.a
.endif
-.if exists(${SADIR}/libkern/libkern.a)
-LIBKERN=${SADIR}/libkern/libkern.a
-.else
-LIBKERN=${SADIR}/libkern/${__objdir}/libkern.a
-.endif
.if exists(${SADIR}/libz/libz.a)
LIBZ=${SADIR}/libz/libz.a
.else
diff --git a/sys/arch/mvme68k/stand/libsa/Makefile b/sys/arch/mvme68k/stand/libsa/Makefile
index a06e496d90a..a659abc2e3e 100644
--- a/sys/arch/mvme68k/stand/libsa/Makefile
+++ b/sys/arch/mvme68k/stand/libsa/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2005/02/20 15:34:06 miod Exp $
+# $OpenBSD: Makefile,v 1.18 2007/11/26 10:01:42 deraadt Exp $
LIB=sa
@@ -9,12 +9,11 @@ NOPROFILE=noprofile
# Logically src/sys
S=${.CURDIR}/../../../..
-DIR_SA=$S/lib/libsa
-DIR_KERN=$S/lib/libkern
SRC_net= arp.c ether.c in_cksum.c net.c netif.c rpc.c nfs.c \
rarp.c bootparam.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 \
@@ -22,6 +21,7 @@ SRC_sa= alloc.c memcpy.c exit.c getfile.c gets.c globals.c \
lseek.c open.c nullfs.c read.c fstat.c \
ufs.c cread.c
+.PATH: ${S}/lib/libkern/arch/m68k ${S}/lib/libkern
SRC_kern= ashrdi3.c
SRC_mvme= exec_mvme.c
@@ -38,8 +38,6 @@ DEFS= -D__INTERNAL_LIBSA_CREAD
INCL= -I${.CURDIR} -I${.CURDIR}/../libbug -I${S}/lib/libsa -I${S}
CFLAGS+= ${XCFLAGS} -O2 ${COPTS} ${DEFS} ${DBG} ${INCL}
-.PATH: ${DIR_SA} ${DIR_KERN}
-
all: libsa.a SRT0.o
install:
diff --git a/sys/arch/mvme88k/stand/libsa/Makefile b/sys/arch/mvme88k/stand/libsa/Makefile
index c470a83e124..ed0aab2baa5 100644
--- a/sys/arch/mvme88k/stand/libsa/Makefile
+++ b/sys/arch/mvme88k/stand/libsa/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2006/05/16 22:51:30 miod Exp $
+# $OpenBSD: Makefile,v 1.8 2007/11/26 10:01:42 deraadt Exp $
LIB=sa
@@ -7,12 +7,11 @@ NOPROFILE=noprofile
# Logically src/sys
S=${.CURDIR}/../../../..
-DIR_SA=$S/lib/libsa
-DIR_KERN=$S/lib/libkern
SRC_net= arp.c ether.c in_cksum.c net.c netif.c rpc.c nfs.c \
rarp.c bootparam.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 \
strlcpy.c strlcat.c snprintf.c \
@@ -20,6 +19,7 @@ SRC_sa= alloc.c memcpy.c exit.c getfile.c gets.c globals.c \
lseek.c open.c nullfs.c read.c fstat.c \
ufs.c cread.c
+.PATH: ${S}/lib/libkern/arch/m88k ${S}/lib/libkern
SRC_kern= ashrdi3.c bzero.c
SRC_mvme= exec_mvme.c
@@ -37,8 +37,6 @@ DEFS= -D__INTERNAL_LIBSA_CREAD
INCL= -I${.CURDIR} -I${.CURDIR}/../libbug -I${S}/lib/libsa -I${S}
CFLAGS+= ${XCFLAGS} ${COPTS} ${DEFS} ${DBG} ${INCL}
-.PATH: ${DIR_SA} ${DIR_KERN}
-
all: libsa.a
install:
diff --git a/sys/arch/mvmeppc/stand/libsa/Makefile b/sys/arch/mvmeppc/stand/libsa/Makefile
index c54da8dfee8..69f4503b63f 100644
--- a/sys/arch/mvmeppc/stand/libsa/Makefile
+++ b/sys/arch/mvmeppc/stand/libsa/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2004/01/25 14:51:46 miod Exp $
+# $OpenBSD: Makefile,v 1.7 2007/11/26 10:01:42 deraadt Exp $
LIB=sa
@@ -7,12 +7,11 @@ NOPROFILE=noprofile
# Logically src/sys
S=${.CURDIR}/../../../..
-DIR_SA=$S/lib/libsa
-DIR_KERN=$S/lib/libkern
SRC_net= arp.c ether.c in_cksum.c net.c netif.c rpc.c nfs.c \
rarp.c bootparam.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 \
strlcpy.c strlcat.c snprintf.c \
@@ -20,6 +19,7 @@ SRC_sa= alloc.c memcpy.c exit.c getfile.c gets.c globals.c \
lseek.c open.c nullfs.c read.c fstat.c \
ufs.c cread.c loadfile.c
+.PATH: ${S}/lib/libkern/arch/m88k ${S}/lib/libkern
SRC_kern= ashrdi3.c bzero.c
SRC_mvme= exec_mvme.c
@@ -38,8 +38,6 @@ INCL= -I${.CURDIR} -I${.CURDIR}/../libbug -I${S}/lib/libsa -I${S}
COPTS= #-fno-defer-pop
CFLAGS+= ${XCFLAGS} ${COPTS} ${DEFS} ${DBG} ${INCL} -O2
-.PATH: ${DIR_SA} ${DIR_KERN}
-
all: libsa.a
install:
diff --git a/sys/arch/sgi/stand/Makefile.inc b/sys/arch/sgi/stand/Makefile.inc
index ea09808bab5..f19cdc6ef4d 100644
--- a/sys/arch/sgi/stand/Makefile.inc
+++ b/sys/arch/sgi/stand/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.3 2005/12/30 02:03:49 millert Exp $
+# $OpenBSD: Makefile.inc,v 1.4 2007/11/26 10:01:42 deraadt Exp $
# $NetBSD: Makefile.inc,v 1.7 2000/08/20 14:57:16 mrg Exp $
.ifndef __INCLUDED_STAND_MAKEFILE_INC
@@ -21,21 +21,6 @@ AS= as -32
LD= ld -m elf32btsmip
.endif
-
-
-### Figure out what to use for libkern
-LIBKERNDIR= ${.CURDIR}/../libkern
-
-.if exists(${LIBKERNDIR}/obj.${MACHINE})
-LIBKERNOBJDIR= ${LIBKERNDIR}/obj.${MACHINE}
-.elif exists(${LIBKERNDIR}/obj)
-LIBKERNOBJDIR= ${LIBKERNDIR}/obj
-.else
-LIBKERNOBJDIR= ${LIBKERNDIR}
-.endif
-
-LIBKERN= ${LIBKERNOBJDIR}/libkern.a
-
### Figure out what to use for libsa
LIBSADIR= ${.CURDIR}/../libsa
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 20:12:08 +0000