Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up the machine symlink stuff ever so slightly. Needs to be

Browse Source 
standardized between files.
This commit is contained in:
mycroft 2000-01-23 17:04:03 +00:00
parent f456106d03
commit 7b49d242ce
17 changed files with 72 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arch/alpha/stand/Makefile.bootprogs
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.bootprogs,v 1.15 2000/01/19 16:29:55 tsutsui Exp $
# $NetBSD: Makefile.bootprogs,v 1.16 2000/01/23 17:04:03 mycroft Exp $
S= ${.CURDIR}/../../../..
@ -24,7 +24,7 @@ machine-links:
ln -s $S/arch/alpha/include alpha
CLEANFILES+=machine alpha
all: machine-links ${PROG}
realall: machine-links ${PROG}
AFLAGS+= -DASSEMBLER
# -I${.CURDIR}/../.. done by Makefile.inc

8
sys/arch/bebox/stand/boot/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.8 1999/06/28 01:20:43 sakamoto Exp $
# $NetBSD: Makefile,v 1.9 2000/01/23 17:04:04 mycroft Exp $
S= ${.CURDIR}/../../../..
@ -30,11 +30,11 @@ BINMODE= 444
RELOC= 0x700000
CLEANFILES+= ${.OBJDIR}/machine ${.OBJDIR}/powerpc
.BEGIN:
@[ -h machine ] || ln -s ${S}/arch/${MACHINE}/include machine
@[ -h powerpc ] || ln -s ${S}/arch/powerpc/include powerpc
.NOPATH: machine powerpc
CLEANFILES+= machine powerpc
### find out what to use for libkern
KERN_AS= library
@ -52,7 +52,7 @@ SAMISCMAKEFLAGS= SA_USE_CREAD=yes SA_USE_LOADFILE=yes
.include "${S}/lib/libsa/Makefile.inc"
LIBSA= ${SALIB}
all: ${BOOTPROG}
realall: ${BOOTPROG}
${BOOTPROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
sh ${.CURDIR}/../newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}

4
sys/arch/hp300/stand/Makefile.buildboot
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.buildboot,v 1.10 1999/12/21 21:06:33 frueauf Exp $
# $NetBSD: Makefile.buildboot,v 1.11 2000/01/23 17:04:05 mycroft Exp $
S= ${.CURDIR}/../../../..
@ -21,7 +21,7 @@ machine-links:
ln -s $S/arch/hp300/include hp300
CLEANFILES+=machine hp300
all: machine-links ${PROG}
realall: machine-links ${PROG}
CLEANFILES+= ${PROGAOUT} vers.c vers.o

6
sys/arch/macppc/stand/ofwboot/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.7 1999/11/23 01:35:37 wrstuden Exp $
# $NetBSD: Makefile,v 1.8 2000/01/23 17:04:05 mycroft Exp $
S= ${.CURDIR}/../../../..
@ -43,11 +43,13 @@ CPPFLAGS+= -I. -I${.CURDIR}/../../.. -I${.CURDIR}/../../../..
CPPFLAGS+= -DRELOC=0x${RELOC}
#CPPFLAGS+= -DXCOFF_GLUE # for booting PCI Powermacs
CLEANFILES+= ${.OBJDIR}/machine ${.OBJDIR}/powerpc ${XCOFFXTRAOBJ}
CLEANFILES+= ${XCOFFXTRAOBJ}
.BEGIN:
@[ -h machine ] || ln -s ${S}/arch/${MACHINE}/include machine
@[ -h powerpc ] || ln -s ${S}/arch/powerpc/include powerpc
.NOPATH: machine powerpc
CLEANFILES+= machine powerpc
### find out what to use for libkern
KERN_AS= library

16
sys/arch/news68k/stand/boot/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.2 2000/01/19 16:30:04 tsutsui Exp $
# $NetBSD: Makefile,v 1.3 2000/01/23 17:04:05 mycroft Exp $
COMMON= ${.CURDIR}/../common
.ifnmake(print-objdir)
@ -26,24 +26,24 @@ CPPFLAGS+= -D_STANDALONE -DBOOT_DEBUG
CPPFLAGS+= -nostdinc -I${.OBJDIR} -I${S}
AFLAGS= -D_LOCORE
CLEANFILES+= ${PROG}.tmp ${.OBJDIR}/machine ${.OBJDIR}/m68k
CLEANFILES+= ${PROG}.tmp machine m68k
L= ${COMMONOBJ}/lib
LIBS= ${L}/sa/libsa.a ${L}/kern/libkern.a ${L}/z/libz.a
.BEGIN: ${.OBJDIR}/machine ${.OBJDIR}/m68k
.BEGIN: machine m68k
.NOPATH: machine m68k
realdepend realall: machine m68k
depend all: ${.OBJDIR}/machine ${.OBJDIR}/m68k
${.OBJDIR}/machine::
machine::
-rm -f $@
ln -s ${S}/arch/${MACHINE}/include $@
${.OBJDIR}/m68k::
m68k::
-rm -f $@
ln -s ${S}/arch/m68k/include $@
${PROG}: ${OBJS} ${.OBJDIR}/machine ${.OBJDIR}/m68k
${PROG}: ${OBJS} machine m68k
${LD} ${LDFLAGS} -o ${PROG} ${OBJS} ${LIBS}
-${SIZE} ${PROG}
${STRIPPROG} ${PROG}

16
sys/arch/news68k/stand/bootxx/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 1999/12/09 14:53:23 tsutsui Exp $
# $NetBSD: Makefile,v 1.2 2000/01/23 17:04:06 mycroft Exp $
COMMON= ${.CURDIR}/../common
.ifnmake(print-objdir)
@ -25,24 +25,24 @@ CPPFLAGS+= -D_STANDALONE -DBOOTXX_DEBUG
CPPFLAGS+= -nostdinc -I${.OBJDIR} -I${S}
AFLAGS= -D_LOCORE
CLEANFILES+= ${.OBJDIR}/machine ${.OBJDIR}/m68k
CLEANFILES+= machine m68k
L= ${COMMONOBJ}/lib
LIBS= ${L}/sa/libsa.a ${L}/kern/libkern.a
.BEGIN: ${.OBJDIR}/machine ${.OBJDIR}/m68k
.BEGIN: machine m68k
.NOPATH: machine m68k
realdepend realall: machine m68k
depend all: ${.OBJDIR}/machine ${.OBJDIR}/m68k
${.OBJDIR}/machine::
machine::
-rm -f $@
ln -s ${S}/arch/${MACHINE}/include $@
${.OBJDIR}/m68k::
m68k::
-rm -f $@
ln -s ${S}/arch/m68k/include $@
${PROG}: ${OBJS} ${.OBJDIR}/machine ${.OBJDIR}/m68k
${PROG}: ${OBJS} machine m68k
${LD} ${LDFLAGS} -o ${PROG} ${OBJS} ${LIBS}
${SIZE} ${PROG}

18
sys/arch/news68k/stand/common/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 1999/12/09 14:53:23 tsutsui Exp $
# $NetBSD: Makefile,v 1.2 2000/01/23 17:04:06 mycroft Exp $
S= ${.CURDIR}/../../../..
@ -10,21 +10,21 @@ CPPFLAGS+= -D_STANDALONE -DBOOT_DEBUG
CPPFLAGS+= -nostdinc -I${.OBJDIR} -I${S} -I.
AFLAGS= -D_LOCORE
CLEANFILES+= ${.OBJDIR}/machine ${.OBJDIR}/m68k
CLEANFILES+= machine m68k
.BEGIN: ${.OBJDIR}/machine ${.OBJDIR}/m68k
.BEGIN: machine m68k
.NOPATH: machine m68k
realdepend realall: machine m68k
${.OBJDIR}/machine::
machine::
-rm -f $@
ln -s ${S}/arch/${MACHINE}/include $@
${.OBJDIR}/m68k::
m68k::
-rm -f $@
ln -s ${S}/arch/m68k/include $@
depend all: ${.OBJDIR}/machine ${.OBJDIR}/m68k
${OBJS}: ${.OBJDIR}/machine ${.OBJDIR}/m68k
${OBJS}: machine m68k
### find out what to use for libkern
KERN_AS= library
@ -44,7 +44,7 @@ LIBSA= ${SALIB}
LIBS= ${LIBSA} ${LIBZ} ${LIBKERN}
all: ${LIBS}
realall: ${LIBS}
cleandir distclean: cleanlibdir

8
sys/arch/newsmips/stand/common/Makefile
View File

@ -1,11 +1,9 @@
# $NetBSD: Makefile,v 1.1 1999/12/17 07:40:11 tsubai Exp $
# $NetBSD: Makefile,v 1.2 2000/01/23 17:04:06 mycroft Exp $
S= ${.CURDIR}/../../../..
OBJS= romcalls.o
CLEANFILES+= machine mips
CFLAGS= -Os -G 0 -mno-abicalls -Wall
CPPFLAGS+= -D_STANDALONE #-DBOOT_DEBUG
@ -27,9 +25,11 @@ SAMISCMAKEFLAGS= SA_USE_CREAD=yes SA_USE_LOADFILE=yes
.BEGIN:
@[ -h machine ] || ln -s ${S}/arch/${MACHINE}/include machine
@[ -h mips ] || ln -s ${S}/arch/mips/include mips
.NOPATH: machine mips
CLEANFILES+= machine mips
.endif
all: ${OBJS} ${KERNLIB} ${ZLIB} ${SALIB}
realall: ${OBJS} ${KERNLIB} ${ZLIB} ${SALIB}
# ln -s ${KERNLIB}
# ln -s ${ZLIB}
# ln -s ${SALIB}

10
sys/arch/ofppc/stand/ofwboot/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.7 1999/10/12 19:40:27 wrstuden Exp $
# $NetBSD: Makefile,v 1.8 2000/01/23 17:04:07 mycroft Exp $
S= ${.CURDIR}/../../../..
@ -31,12 +31,8 @@ CPPFLAGS+= -DCOMPAT_386BSD_MBRPART
.BEGIN:
@[ -h machine ] || ln -s ${S}/arch/${MACHINE}/include machine
@[ -h powerpc ] || ln -s ${S}/arch/powerpc/include powerpc
CLEANFILES+= ${.OBJDIR}/machine ${.OBJDIR}/powerpc
${.OBJDIR}/machine::
-rm -f $@
ln -s $S/arch/ofppc/include $@
.NOPATH: machine powerpc
CLEANFILES+= machine powerpc
### find out what to use for libkern
KERN_AS= library

12
sys/arch/pmax/stand/Makefile.booters
View File

@ -1,18 +1,18 @@
# $NetBSD: Makefile.booters,v 1.27 1999/11/27 23:55:23 simonb Exp $
# $NetBSD: Makefile.booters,v 1.28 2000/01/23 17:04:07 mycroft Exp $
# $S must correspond to the top of the 'sys' tree
S= ${.CURDIR}/../../../..
.BEGIN: ${.OBJDIR}/machine ${.OBJDIR}/pmax ${.OBJDIR}/mips
${PROG} depend beforedepend all: ${.OBJDIR}/machine ${.OBJDIR}/pmax ${.OBJDIR}/mips
.BEGIN: machine pmax mips
${PROG} realdepend realall: machine pmax mips
CLEANFILES+= machine pmax mips
${.OBJDIR}/machine:
machine:
-rm -f ${.TARGET}
ln -s $S/arch/${MACHINE}/include ${.TARGET}
${.OBJDIR}/pmax:
pmax:
-rm -f ${.TARGET}
ln -s $S/arch/${MACHINE}/include ${.TARGET}
${.OBJDIR}/mips:
mips:
-rm -f ${.TARGET}
ln -s $S/arch/mips/include mips

6
sys/arch/sparc/stand/Makefile.buildboot
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.buildboot,v 1.8 1999/11/25 13:27:30 pk Exp $
# $NetBSD: Makefile.buildboot,v 1.9 2000/01/23 17:04:10 mycroft Exp $
S= ${.CURDIR}/../../../..
@ -45,6 +45,6 @@ LIBSA= ${SALIB}
.if !make(obj)
.BEGIN:
@([ -h machine ] || ln -s ${S}/arch/${MACHINE}/include machine)
.NOPATH: machine
CLEANFILES+= machine
.endif
CLEANFILES+= machine

6
sys/arch/sparc/stand/installboot/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.10 1999/11/29 14:49:12 pk Exp $
# $NetBSD: Makefile,v 1.11 2000/01/23 17:04:08 mycroft Exp $
.include <bsd.own.mk>
@ -19,8 +19,8 @@ LDSTATIC?= -static
.if !make(obj)
.BEGIN:
@([ -h machine ] || ln -s ${.CURDIR}/../../include machine)
.NOPATH: machine
CLEANFILES+= machine
.endif
CLEANFILES+= machine
.include <bsd.prog.mk>

6
sys/arch/sparc64/stand/Makefile.inc
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.3 1999/11/25 14:46:08 pk Exp $
# $NetBSD: Makefile.inc,v 1.4 2000/01/23 17:04:11 mycroft Exp $
BINDIR= /usr/mdec
@ -10,6 +10,6 @@ CFLAGS+= -msoft-float
.if !make(obj)
.BEGIN:
@([ -h machine ] || ln -s ${S}/arch/sparc64/include machine)
.NOPATH: machine
CLEANFILES+= machine
.endif
CLEANFILES+= machine

11
sys/arch/sparc64/stand/bootblk/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 1999/11/25 06:06:03 mrg Exp $
# $NetBSD: Makefile,v 1.6 2000/01/23 17:04:11 mycroft Exp $
CURDIR= ${.CURDIR}
S= ${CURDIR}/../../../..
@ -26,14 +26,15 @@ SVR4=-U__SVR4 -U__svr4__ -D__NetBSD__
INCLUDES= -I. -I$S/arch -I$S -nostdinc
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_LKM ${SVR4}
all:: bootblk.text bootblk
clean::
rm -f assym.fth.h bootblk.text machine bootblk
realall:: bootblk.text bootblk
.NOPATH: machine
machine:
ln -s ../../include machine
clean::
rm -f assym.fth.h machine bootblk bootblk.text
assym.fth.h: ./genassym.sh genfth.cf machine
sh ./genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} \
< genfth.cf > assym.fth.h

4
sys/arch/sparc64/stand/ofwboot/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.12 1999/11/24 01:54:34 mrg Exp $
# $NetBSD: Makefile,v 1.13 2000/01/23 17:04:11 mycroft Exp $
CURDIR= ${.CURDIR}
S= ${CURDIR}/../../../..
@ -67,7 +67,9 @@ SAMISCMAKEFLAGS= SA_USE_CREAD=yes
.include "${S}/lib/libsa/Makefile.inc"
LIBSA= ${SALIB}
.NOPATH: machine
${OBJS}: machine
machine:
ln -s ../../include machine
.if CROSS

4
sys/arch/sun3/stand/libsa/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.22 1999/12/17 07:28:01 jeremy Exp $
# $NetBSD: Makefile,v 1.23 2000/01/23 17:04:12 mycroft Exp $
LIB=sa
@ -38,7 +38,7 @@ SRC_here= clock.c dev_disk.c devopen.c exec_sun.c \
SRCS= ${SRC_net} ${SRC_sa} ${SRC_kern} ${SRC_here}
OBJS= ctrlsp.o
all: libsa.a SRT0.o SRT1.o
realall: libsa.a SRT0.o SRT1.o
# only needed during build
libinstall::

4
sys/arch/x68k/stand/mboot/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.3 2000/01/19 16:30:02 tsutsui Exp $
# $NetBSD: Makefile,v 1.4 2000/01/23 17:04:12 mycroft Exp $
BOOT= mboot
VERSION= 0.1
@ -37,7 +37,7 @@ machine-links:
ln -s ${KERN}/arch/${MACHINE_ARCH}/include ${MACHINE_ARCH}
CLEANFILES+= machine ${MACHINE_ARCH}
all: machine-links ${PROG}
realall: machine-links ${PROG}
${BOOT}: ${OBJS}
${LD} ${LDFLAGS} -o ${BOOT}.x ${OBJS} ${LDLIBS}
# ${STRIPPROG} ${BOOT}.x