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

clean up a bit. include libraries more carefully, so that when compressed 

read code is integrated into libsa things will work properly.
This commit is contained in:
cgd 1997-01-17 21:14:31 +00:00
parent 8852c180ef
commit 7e7bb6e04d
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/arch/alpha/stand/boot/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.11 1997/01/16 02:59:08 cgd Exp $ # $NetBSD: Makefile,v 1.12 1997/01/17 21:14:31 cgd Exp $
S= ${.CURDIR}/../../../.. S= ${.CURDIR}/../../../..
@ -11,8 +11,6 @@ BOOT_SRCS = start.S boot.c loadfile.c disk.c conf.c prom.c prom_disp.S OSFpal.c
BOOT_SRCS+= devopen.c filesystem.c prom_swpal.S BOOT_SRCS+= devopen.c filesystem.c prom_swpal.S
#BOOT_SRCS+= cread.c
BOOT_OBJS = ${BOOT_SRCS:N*.h:R:S/$/.o/g} BOOT_OBJS = ${BOOT_SRCS:N*.h:R:S/$/.o/g}
HEADERSIZE_PROG = headersize HEADERSIZE_PROG = headersize
@ -30,6 +28,7 @@ LIBZ= ${ZLIB}
### find out what to use for libsa ### find out what to use for libsa
SA_AS= library SA_AS= library
SAREL= SAREL=
#SA_USE_CREAD= yes
EXTRACFLAGS= -mno-fp-regs EXTRACFLAGS= -mno-fp-regs
.include "${S}/lib/libsa/Makefile.inc" .include "${S}/lib/libsa/Makefile.inc"
LIBSA= ${SALIB} LIBSA= ${SALIB}
@ -44,11 +43,11 @@ CLEANFILES+= vers.c vers.o ${BOOT_PROG}.sym ${BOOT_PROG}.nosym \
all: ${BOOT_PROG} all: ${BOOT_PROG}
${BOOT_PROG}.sym: ${BOOT_OBJS} ${LIBZ} ${LIBSA} ${LIBKERN} ${BOOT_PROG}.sym: ${BOOT_OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
sh ${.CURDIR}/newvers.sh ${.CURDIR}/version sh ${.CURDIR}/newvers.sh ${.CURDIR}/version
${COMPILE.c} vers.c ${COMPILE.c} vers.c
${LD} -Ttext ${BOOT_RELOC} -N -e start -o ${BOOT_PROG}.sym \ ${LD} -Ttext ${BOOT_RELOC} -N -e start -o ${BOOT_PROG}.sym \
${BOOT_OBJS} vers.o ${LIBZ} ${LIBSA} ${LIBKERN} ${BOOT_OBJS} vers.o ${LIBSA} ${LIBZ} ${LIBSA} ${LIBKERN}
size ${BOOT_PROG}.sym size ${BOOT_PROG}.sym
${BOOT_PROG}.nosym: ${BOOT_PROG}.sym ${BOOT_PROG}.nosym: ${BOOT_PROG}.sym

9
sys/arch/alpha/stand/netboot/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.4 1997/01/16 02:59:10 cgd Exp $ # $NetBSD: Makefile,v 1.5 1997/01/17 21:14:32 cgd Exp $
S= ${.CURDIR}/../../../.. S= ${.CURDIR}/../../../..
@ -14,8 +14,6 @@ BOOT_SRCS+= dev_net.c conf.c devopen.c
BOOT_SRCS+= if_prom.c loadfile.c getsecs.c BOOT_SRCS+= if_prom.c loadfile.c getsecs.c
#BOOT_SRCS+= cread.c
BOOT_OBJS = ${BOOT_SRCS:N*.h:R:S/$/.o/g} BOOT_OBJS = ${BOOT_SRCS:N*.h:R:S/$/.o/g}
HEADERSIZE_PROG = headersize HEADERSIZE_PROG = headersize
@ -33,6 +31,7 @@ LIBZ= ${ZLIB}
### find out what to use for libsa ### find out what to use for libsa
SA_AS= library SA_AS= library
SAREL= SAREL=
#SA_USE_CREAD= yes
EXTRACFLAGS= -mno-fp-regs EXTRACFLAGS= -mno-fp-regs
.include "${S}/lib/libsa/Makefile.inc" .include "${S}/lib/libsa/Makefile.inc"
LIBSA= ${SALIB} LIBSA= ${SALIB}
@ -48,11 +47,11 @@ CLEANFILES+= vers.c vers.o ${BOOT_PROG}.sym ${BOOT_PROG}.nosym \
all: ${BOOT_PROG} all: ${BOOT_PROG}
${BOOT_PROG}.sym: ${BOOT_OBJS} ${LIBZ} ${LIBSA} ${LIBKERN} ${BOOT_PROG}.sym: ${BOOT_OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
sh ${.CURDIR}/newvers.sh ${.CURDIR}/version sh ${.CURDIR}/newvers.sh ${.CURDIR}/version
${COMPILE.c} vers.c ${COMPILE.c} vers.c
${LD} -Ttext ${BOOT_RELOC} -N -e start -o ${BOOT_PROG}.sym \ ${LD} -Ttext ${BOOT_RELOC} -N -e start -o ${BOOT_PROG}.sym \
${BOOT_OBJS} vers.o ${LIBZ} ${LIBSA} ${LIBKERN} ${BOOT_OBJS} vers.o ${LIBSA} ${LIBZ} ${LIBSA} ${LIBKERN}
size ${BOOT_PROG}.sym size ${BOOT_PROG}.sym
${BOOT_PROG}.nosym: ${BOOT_PROG}.sym ${BOOT_PROG}.nosym: ${BOOT_PROG}.sym