From: gvf Date: Tue, 22 Apr 1997 16:13:38 +0000 (+0000) Subject: Add libz and tick version # to reflect change. X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=4824d8b69d95626e1b85ae99956f4fbe82c73d72;p=openbsd Add libz and tick version # to reflect change. --- diff --git a/sys/arch/mvme68k/stand/Makefile b/sys/arch/mvme68k/stand/Makefile index 9f897196dce..27c0831431d 100644 --- a/sys/arch/mvme68k/stand/Makefile +++ b/sys/arch/mvme68k/stand/Makefile @@ -1,6 +1,6 @@ -# $Id: Makefile,v 1.3 1996/05/16 02:17:32 chuck Exp $ +# $Id: Makefile,v 1.4 1997/04/22 16:13:38 gvf Exp $ -SUBDIR= bugcrt libbug libsa sboot netboot bootxx bootsd bootst \ +SUBDIR= bugcrt libbug libsa libz sboot netboot bootxx bootsd bootst \ installboot prtvid wrtvid .include diff --git a/sys/arch/mvme68k/stand/bootsd/Makefile b/sys/arch/mvme68k/stand/bootsd/Makefile index 6d704dbbda3..d098d732b4b 100644 --- a/sys/arch/mvme68k/stand/bootsd/Makefile +++ b/sys/arch/mvme68k/stand/bootsd/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 8.1 (Berkeley) 6/10/93 -# $OpenBSD: Makefile,v 1.6 1996/05/16 02:46:56 chuck Exp $ +# $OpenBSD: Makefile,v 1.7 1997/04/22 16:13:39 gvf Exp $ RELOC=0x3F0000 @@ -8,15 +8,17 @@ DEFS= INCPATH=-I${.CURDIR} -I${.CURDIR}/../libsa -I${.CURDIR}/../libbug \ -I${.CURDIR}/../../include -I${S} -I${S}/lib/libsa CFLAGS= -O2 ${INCPATH} ${DEFS} ${COPTS} +LDFLAGS=-N -T ${RELOC} CLEANFILES+=bootsd .include "${S}/arch/${MACHINE}/stand/bugcrt/Makefile.inc" .include "${S}/arch/${MACHINE}/stand/libbug/Makefile.inc" .include "${S}/arch/${MACHINE}/stand/libsa/Makefile.inc" +.include "${S}/arch/${MACHINE}/stand/libz/Makefile.inc" SRCS= boot.c conf.c version.c -LIBS= ${LIBSA} ${LIBBUG} +LIBS= ${LIBSA} ${LIBBUG} ${LIBZ} OBJS= ${SRCS:N*.h:R:S/$/.o/g} @@ -25,9 +27,9 @@ ALL= ${BOOTS} all: ${ALL} -bootsd: ${OBJS} ${LIBSA} ${BUGCRT} ${LIBBUG} - ${LD} -N -T ${RELOC} -o $@ \ - ${SRTOBJ} ${BUGCRT} ${OBJS} ${LIBSA} ${LIBBUG} +bootsd: ${OBJS} ${BUGCRT} ${LIBS} + ${LD} ${LDFLAGS} -o $@ \ + ${SRTOBJ} ${BUGCRT} ${OBJS} ${LIBS} install: install -c -m 555 -g bin -o bin ${BOOTS} ${DESTDIR}${MDEC_DIR} diff --git a/sys/arch/mvme68k/stand/bootsd/version.c b/sys/arch/mvme68k/stand/bootsd/version.c index 89fd48bad69..2289dd21772 100644 --- a/sys/arch/mvme68k/stand/bootsd/version.c +++ b/sys/arch/mvme68k/stand/bootsd/version.c @@ -1,8 +1,8 @@ -/* $OpenBSD: version.c,v 1.6 1996/05/29 15:41:01 chuck Exp $ */ +/* $OpenBSD: version.c,v 1.7 1997/04/22 16:13:39 gvf Exp $ */ /* * make a random change to this file when you want the bootblock - * revision to increase. like change this x to a q, or something. + * revision to increase. like change this q to an x, or something. */ -char *version = "$Revision: 1.6 $"; +char *version = "$Revision: 1.7 $"; diff --git a/sys/arch/mvme68k/stand/bootst/Makefile b/sys/arch/mvme68k/stand/bootst/Makefile index 46103e215f9..c8cb9255745 100644 --- a/sys/arch/mvme68k/stand/bootst/Makefile +++ b/sys/arch/mvme68k/stand/bootst/Makefile @@ -1,7 +1,8 @@ # from: @(#)Makefile 8.1 (Berkeley) 6/10/93 -# $OpenBSD: Makefile,v 1.7 1996/05/28 15:15:39 chuck Exp $ +# $OpenBSD: Makefile,v 1.8 1997/04/22 16:13:40 gvf Exp $ RELOC=0x3F0000 +SIZE?= size S= ${.CURDIR}/../../../.. DEFS= @@ -10,15 +11,15 @@ INCPATH=-I${.CURDIR} -I${.CURDIR}/../libsa -I${.CURDIR}/../libbug \ CFLAGS= -O2 ${INCPATH} ${DEFS} ${COPTS} CLEANFILES+=stboot bootst bootst.bug -.include "${S}/arch/${MACHINE}/stand/libsa/Makefile.inc" -.include "${S}/arch/${MACHINE}/stand/libbug/Makefile.inc" -.include "${S}/arch/${MACHINE}/stand/bugcrt/Makefile.inc" .include "${S}/arch/${MACHINE}/stand/wrtvid/Makefile.inc" +.include "${S}/arch/${MACHINE}/stand/bugcrt/Makefile.inc" +.include "${S}/arch/${MACHINE}/stand/libbug/Makefile.inc" +.include "${S}/arch/${MACHINE}/stand/libsa/Makefile.inc" +.include "${S}/arch/${MACHINE}/stand/libz/Makefile.inc" SRCS= boot.c conf.c dev_tape.c rawfs.c version.c - -LIBS= ${LIBSA} ${LIBBUG} +LIBS= ${LIBSA} ${LIBBUG} ${LIBZ} OBJS= ${SRCS:N*.h:R:S/$/.o/g} @@ -29,7 +30,7 @@ all: ${ALL} bootst.bug: ${OBJS} ${BUGCRT} ${LIBS} ${LD} -s -N -T ${RELOC} ${BUGCRT} ${OBJS} ${LIBS} -o $@ - @size bootst.bug + @${SIZE} bootst.bug bootst stboot: bootst.bug ${WRTVID} ${WRTVID} bootst.bug diff --git a/sys/arch/mvme68k/stand/bootst/version.c b/sys/arch/mvme68k/stand/bootst/version.c index f773431d435..63e22d21e7b 100644 --- a/sys/arch/mvme68k/stand/bootst/version.c +++ b/sys/arch/mvme68k/stand/bootst/version.c @@ -1,8 +1,8 @@ -/* $OpenBSD: version.c,v 1.2 1996/05/29 15:41:02 chuck Exp $ */ +/* $OpenBSD: version.c,v 1.3 1997/04/22 16:13:40 gvf Exp $ */ /* * make a random change to this file when you want the bootblock - * revision to increase. like change this x to a q, or something. + * revision to increase. like change this q to an x, or something. */ -char *version = "$Revision: 1.2 $"; +char *version = "$Revision: 1.3 $"; diff --git a/sys/arch/mvme68k/stand/bootxx/Makefile b/sys/arch/mvme68k/stand/bootxx/Makefile index a45f3993b83..fe881a90d3a 100644 --- a/sys/arch/mvme68k/stand/bootxx/Makefile +++ b/sys/arch/mvme68k/stand/bootxx/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 8.1 (Berkeley) 6/10/93 -# $OpenBSD: Makefile,v 1.1 1996/05/16 02:37:25 chuck Exp $ +# $OpenBSD: Makefile,v 1.2 1997/04/22 16:13:41 gvf Exp $ RELOC=0x3F0000 @@ -13,10 +13,11 @@ CLEANFILES+=bootxx .include "${S}/arch/${MACHINE}/stand/bugcrt/Makefile.inc" .include "${S}/arch/${MACHINE}/stand/libbug/Makefile.inc" .include "${S}/arch/${MACHINE}/stand/libsa/Makefile.inc" +.include "${S}/arch/${MACHINE}/stand/libz/Makefile.inc" SRCS= bootxx.c conf.c version.c -LIBS= ${LIBSA} ${LIBBUG} +LIBS= ${LIBSA} ${LIBBUG} ${LIBZ} OBJS= ${SRCS:N*.h:R:S/$/.o/g} diff --git a/sys/arch/mvme68k/stand/bootxx/version.c b/sys/arch/mvme68k/stand/bootxx/version.c index c68e44a5350..b02c2e17bd2 100644 --- a/sys/arch/mvme68k/stand/bootxx/version.c +++ b/sys/arch/mvme68k/stand/bootxx/version.c @@ -1,8 +1,8 @@ -/* $OpenBSD: version.c,v 1.1 1996/05/16 02:37:26 chuck Exp $ */ +/* $OpenBSD: version.c,v 1.2 1997/04/22 16:13:41 gvf Exp $ */ /* * make a random change to this file when you want the bootblock - * revision to increase. like change this x to a y, or something. + * revision to increase. like change this y to an x, or something. */ -char *version = "$Revision: 1.1 $"; +char *version = "$Revision: 1.2 $"; diff --git a/sys/arch/mvme68k/stand/libz/Makefile b/sys/arch/mvme68k/stand/libz/Makefile new file mode 100644 index 00000000000..1e60765d790 --- /dev/null +++ b/sys/arch/mvme68k/stand/libz/Makefile @@ -0,0 +1,8 @@ +# $OpenBSD: Makefile,v 1.1 1997/04/22 16:13:42 gvf Exp $ + +S=${.CURDIR}/../../../.. +ZDST=${.OBJDIR} + +.PATH: ${S}/lib/libz + +.include "${S}/lib/libz/Makefile" diff --git a/sys/arch/mvme68k/stand/libz/Makefile.inc b/sys/arch/mvme68k/stand/libz/Makefile.inc new file mode 100644 index 00000000000..1825a7eddd6 --- /dev/null +++ b/sys/arch/mvme68k/stand/libz/Makefile.inc @@ -0,0 +1,14 @@ +# $OpenBSD: Makefile.inc,v 1.1 1997/04/22 16:13:42 gvf Exp $ + +LIB_Z_DIR=${S}/arch/${MACHINE}/stand/libz + +LIBZ_DIR!= cd ${LIB_Z_DIR}; \ + printf "xxx:\n\techo \$${.OBJDIR}\n" | ${MAKE} -r -s -f - xxx + +LIBZ=${LIBZ_DIR}/libz.a + +$(LIBZ): .NOTMAIN __always_make_libz + @echo making sure the libz is up to date... + @(cd ${LIB_Z_DIR}; ${MAKE} "XCFLAGS=${CFLAGS}") + +__always_make_libz: .NOTMAIN diff --git a/sys/arch/mvme68k/stand/netboot/Makefile b/sys/arch/mvme68k/stand/netboot/Makefile index 66ab572ce96..8c6a70b860e 100644 --- a/sys/arch/mvme68k/stand/netboot/Makefile +++ b/sys/arch/mvme68k/stand/netboot/Makefile @@ -1,28 +1,32 @@ -# $OpenBSD: Makefile,v 1.5 1996/05/16 02:55:35 chuck Exp $ +# $OpenBSD: Makefile,v 1.6 1997/04/22 16:13:43 gvf Exp $ RELOC=0x3F0000 +SIZE?= size S= ${.CURDIR}/../../../.. DEFS= -DSUN_BOOTPARAMS INCPATH=-I${.CURDIR} -I${.CURDIR}/../libsa -I${.CURDIR}/../libbug \ -I${S} -I${S}/lib/libsa -CFLAGS= -O2 ${INCPATH} ${DEFS} ${COPTS} +CFLAGS= -O2 ${DEFS} ${INCPATH} ${COPTS} CLEANFILES+=netboot netboot.bin .include "${S}/arch/${MACHINE}/stand/bugcrt/Makefile.inc" .include "${S}/arch/${MACHINE}/stand/libbug/Makefile.inc" .include "${S}/arch/${MACHINE}/stand/libsa/Makefile.inc" +.include "${S}/arch/${MACHINE}/stand/libz/Makefile.inc" SRCS= boot.c conf.c version.c devopen.c dev_net.c SRCS+= if_ie.c if_le.c OBJS= ${SRCS:S/.c/.o/g} +LIBS= ${LIBSA} ${LIBBUG} ${LIBZ} +LDFLAGS+= -nostdlib -s -N -T ${RELOC} all: netboot.bin -netboot: ${OBJS} ${LIBSA} ${BUGCRT} ${LIBBUG} - ${LD} -s -N -T ${RELOC} -o $@ \ - ${SRTOBJ} ${BUGCRT} ${OBJS} ${LIBSA} ${LIBBUG} - @size $@ +netboot: ${OBJS} ${BUGCRT} ${LIBS} + ${LD} ${LDFLAGS} -o $@ \ + ${SRTOBJ} ${BUGCRT} ${OBJS} ${LIBS} + @${SIZE} $@ netboot.bin: netboot dd ibs=32 skip=1 if=netboot of=$@ diff --git a/sys/arch/mvme68k/stand/netboot/version.c b/sys/arch/mvme68k/stand/netboot/version.c index 2f3269d6919..80f42491f1e 100644 --- a/sys/arch/mvme68k/stand/netboot/version.c +++ b/sys/arch/mvme68k/stand/netboot/version.c @@ -1,8 +1,8 @@ -/* $OpenBSD: version.c,v 1.5 1996/05/29 15:41:02 chuck Exp $ */ +/* $OpenBSD: version.c,v 1.6 1997/04/22 16:13:44 gvf Exp $ */ /* * make a random change to this file when you want the bootblock - * revision to increase. like change this x to a q, or something. + * revision to increase. like change this q to an x, or something. */ -char *version = "$Revision: 1.5 $"; +char *version = "$Revision: 1.6 $"; diff --git a/sys/arch/mvme68k/stand/sboot/Makefile b/sys/arch/mvme68k/stand/sboot/Makefile index 4223720cac3..48bf0b26df7 100644 --- a/sys/arch/mvme68k/stand/sboot/Makefile +++ b/sys/arch/mvme68k/stand/sboot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 1996/05/16 02:35:43 chuck Exp $ +# $OpenBSD: Makefile,v 1.5 1997/04/22 16:13:44 gvf Exp $ S= ${.CURDIR}/../../../.. INCL?= -I${.CURDIR} -I${.CURDIR}/../libsa -I${S}/lib/libsa -I${S} @@ -6,24 +6,27 @@ COPTS?= ${DEFS} ${INCL} .include "${S}/arch/${MACHINE}/stand/libbug/Makefile.inc" .include "${S}/arch/${MACHINE}/stand/libsa/Makefile.inc" +.include "${S}/arch/${MACHINE}/stand/libz/Makefile.inc" SRCS= sboot.c clock.c etherfun.c if_le.c OBJS= ${SRCS:S/.c/.o/g} +LIBS= ${LIBSA} ${LIBBUG} ${LIBZ} +LDFLAGS= -N -s -static CLEANFILES+=XBUG.o XSRT0.o oc_cksum.o sboot.tmp rboot.tmp srec sboot rboot MDEC_DIR?=/usr/mdec all: sboot rboot -sboot.tmp: XSRT0.o oc_cksum.o ${OBJS} ${LIBSA} ${LIBBUG} - ld -N -s -static -T 0x4000 XSRT0.o ${OBJS} oc_cksum.o -o sboot.tmp ${LIBSA} ${LIBBUG} +sboot.tmp: XSRT0.o oc_cksum.o ${OBJS} ${LIBS} + ${LD} ${LDFLAGS} -T 0x4000 XSRT0.o ${OBJS} oc_cksum.o -o $@ ${LIBS} -rboot.tmp: XBUG.o XSRT0.o oc_cksum.o ${OBJS} ${LIBSA} ${LIBBUG} - ld -N -s -static -Ttext 0xffa00000 -Tdata 0x4000 XBUG.o XSRT0.o \ - ${OBJS} oc_cksum.o -o rboot.tmp ${LIBSA} ${LIBBUG} +rboot.tmp: XBUG.o XSRT0.o oc_cksum.o ${OBJS} ${LIBS} + ${LD} ${LDFLAGS} -T 0xffa00000 -Tdata 0x4000 XBUG.o XSRT0.o \ + ${OBJS} oc_cksum.o -o $@ ${LIBS} srec: srec.c - ${CC} ${.CURDIR}/srec.c -o srec + ${HOSTCC} -o $@ ${.CURDIR}/srec.c sboot: sboot.tmp srec dd ibs=32 skip=1 if=sboot.tmp | ${.OBJDIR}/srec 4 0x4000 sboot > sboot