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

Rework things to move common stuff into Makefile.inc.

Browse Source
This commit is contained in:
matt 2003-12-11 17:34:09 +00:00
parent 68c32a13a8
commit 786b602bd3
4 changed files with 22 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/arch/vax/boot/Makefile.inc
View File

@ -1,13 +1,30 @@
# $NetBSD: Makefile.inc,v 1.7 2003/12/08 07:32:19 matt Exp $
# $NetBSD: Makefile.inc,v 1.8 2003/12/11 17:34:09 matt Exp $
RELOC=0x2f0000
.PATH: ${.CURDIR}/../../vax ${.CURDIR}/../common
CPPFLAGS+=-I. -I${.CURDIR}/../../../../ -I${.CURDIR}/../../ -I${.CURDIR}/../common -I${.CURDIR}/../../include
CPPFLAGS+=-I.
CPPFLAGS+=-I${.CURDIR}/../../../../
CPPFLAGS+=-I${.CURDIR}/../../
CPPFLAGS+=-I${.CURDIR}/../common
CPPFLAGS+=-I${.CURDIR}/../../include
CPPFLAGS+=-DRELOC=${RELOC}
WARNS?= 1
CFLAGS+=-ffreestanding
.if ${HAVE_GCC3} == "no"
CFLAGS+=-mno-asm-pic
AFLAGS+=-mno-asm-pic
.endif
MKMAN=no
.if ${MACHINE} == "vax"
.PHONY: machine-links
beforedepend: machine-links
machine-links:
@rm -f machine && ln -s ${S}/arch/${MACHINE}/include machine
@rm -f ${MACHINE_ARCH} && ln -s ${S}/arch/${MACHINE_ARCH}/include ${MACHINE_ARCH}
.NOPATH: machine ${MACHINE_ARCH}
CLEANFILES+= machine ${MACHINE_ARCH}
.endif

14
sys/arch/vax/boot/boot/Makefile
View File

@ -1,12 +1,10 @@
# $NetBSD: Makefile,v 1.33 2003/12/08 07:32:19 matt Exp $
# $NetBSD: Makefile,v 1.34 2003/12/11 17:34:09 matt Exp $
S= ${.CURDIR}/../../../..
NOMAN= # defined
.include <bsd.own.mk>
PROG= boot
WARNS?= 1
DEVS= hp.c ctu.c ra.c mfm.c if_qe.c if_le.c if_ze.c if_de.c if_ni.c
SRCS= srt0.S boot.c devopen.c conf.c autoconf.c netio.c rom.c romread.S \
consio.c consio2.S str.S ${DEVS} findcpu.c vers.c
@ -33,16 +31,6 @@ KERN_AS=library
.include "${S}/lib/libkern/Makefile.inc"
LIBKERN=${KERNLIB}
.if ${MACHINE} == "vax"
.PHONY: machine-links
beforedepend: machine-links
machine-links:
@rm -f machine && ln -s ${S}/arch/${MACHINE}/include machine
@rm -f ${MACHINE_ARCH} && ln -s ${S}/arch/${MACHINE_ARCH}/include ${MACHINE_ARCH}
.NOPATH: machine ${MACHINE_ARCH}
CLEANFILES+= machine ${MACHINE_ARCH}
.endif
.if ${OBJECT_FMT} == "ELF"
START=start
.else

14
sys/arch/vax/boot/xxboot/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.19 2003/12/09 04:54:54 matt Exp $
# $NetBSD: Makefile,v 1.20 2003/12/11 17:34:10 matt Exp $
S= ${.CURDIR}/../../../..
@ -9,7 +9,6 @@ LINKS= ${BINDIR}/xxboot ${BINDIR}/raboot
LINKS+= ${BINDIR}/xxboot ${BINDIR}/rdboot
LINKS+= ${BINDIR}/xxboot ${BINDIR}/sdboot
LINKS+= ${BINDIR}/xxboot ${BINDIR}/hpboot
WARNS?= 1
SRCS= start.S bootxx.c romread.S str.S
@ -23,7 +22,6 @@ CPPFLAGS+=-D_STANDALONE -DLIBSA_NO_FD_CHECKING -DLIBSA_NO_RAW_ACCESS \
# Use small daddr_t to avoid code bloat
CPPFLAGS+=-D__daddr_t=int32_t
BINDIR= /usr/mdec
NOMAN= # defined
CFLAGS= -Os
LIBC=
@ -36,18 +34,8 @@ KERN_AS=library
.include "${S}/lib/libkern/Makefile.inc"
LIBKERN=${KERNLIB}
.if ${MACHINE} == "vax"
.PHONY: machine-links
beforedepend: machine-links
machine-links:
@[ -h machine ] || ln -s ${S}/arch/${MACHINE}/include machine
@[ -h ${MACHINE_ARCH} ] || ln -s ${S}/arch/${MACHINE_ARCH}/include ${MACHINE_ARCH}
.NOPATH: machine ${MACHINE_ARCH}
CLEANFILES+= machine ${MACHINE_ARCH}
.endif
CLEANFILES+= ${PROG}.out
${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
${PROG}: ${OBJS} ${LIBSA} ${LIBKERN}
${LD} -N -Ttext 100000 -o ${PROG}.out ${OBJS} ${LIBSA} ${LIBKERN}
${SIZE} ${PROG}.out

14
sys/arch/vax/boot/xxboot_ustarfs/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.6 2003/12/09 04:54:54 matt Exp $
# $NetBSD: Makefile,v 1.7 2003/12/11 17:34:10 matt Exp $
S= ${.CURDIR}/../../../..
@ -7,7 +7,6 @@ S= ${.CURDIR}/../../../..
.PATH: ${.CURDIR}/../xxboot
PROG= xxboot_ustarfs
WARNS?= 1
SRCS= start.S bootxx.c romread.S str.S
@ -19,7 +18,6 @@ CPPFLAGS+=-D_STANDALONE -DLIBSA_NO_FD_CHECKING -DLIBSA_NO_RAW_ACCESS \
-DLIBSA_NO_FS_WRITE -DLIBSA_NO_FS_SEEK \
-DNEED_USTARFS
BINDIR= /usr/mdec
NOMAN= # defined
CFLAGS= -Os
LIBC=
@ -32,18 +30,8 @@ KERN_AS=library
.include "${S}/lib/libkern/Makefile.inc"
LIBKERN=${KERNLIB}
.if ${MACHINE} == "vax"
.PHONY: machine-links
beforedepend: machine-links
machine-links:
@[ -h machine ] || ln -s ${S}/arch/${MACHINE}/include machine
@[ -h ${MACHINE_ARCH} ] || ln -s ${S}/arch/${MACHINE_ARCH}/include ${MACHINE_ARCH}
.NOPATH: machine ${MACHINE_ARCH}
CLEANFILES+= machine ${MACHINE_ARCH}
.endif
CLEANFILES+= ${PROG}.out
${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
${PROG}: ${OBJS} ${LIBSA} ${LIBKERN}
${LD} -N -Ttext 100000 -o ${PROG}.out ${OBJS} ${LIBSA} ${LIBKERN}
${SIZE} ${PROG}.out