Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-1-5]: src/sys/arch/mvme68k/stand Pullup from trunk: 1.3 - 1.4



details:   https://anonhg.NetBSD.org/src/rev/0fdc5b121347
branches:  netbsd-1-5
changeset: 488276:0fdc5b121347
user:      scw <scw%NetBSD.org@localhost>
date:      Mon Jun 26 18:14:03 2000 +0000

description:
Pullup from trunk: 1.3 - 1.4
Approved by: thorpej

DTRT for `dependall' during a make build. This slipped through the net
due to a local fix which got forgotten about.

diffstat:

 sys/arch/mvme68k/stand/bootxx/Makefile |  17 ++++++-----------
 sys/arch/mvme68k/stand/bugcrt/Makefile |   4 ++--
 2 files changed, 8 insertions(+), 13 deletions(-)

diffs (59 lines):

diff -r 141183ec5f9a -r 0fdc5b121347 sys/arch/mvme68k/stand/bootxx/Makefile
--- a/sys/arch/mvme68k/stand/bootxx/Makefile    Mon Jun 26 18:13:13 2000 +0000
+++ b/sys/arch/mvme68k/stand/bootxx/Makefile    Mon Jun 26 18:14:03 2000 +0000
@@ -1,10 +1,12 @@
 #      from: @(#)Makefile      8.1 (Berkeley) 6/10/93
-#      $NetBSD: Makefile,v 1.3 1998/06/12 23:11:46 cgd Exp $
+#      $NetBSD: Makefile,v 1.3.28.1 2000/06/26 18:14:03 scw Exp $
 
 RELOC=0x3F0000 
 
 S=     ${.CURDIR}/../../../..
 DEFS= 
+NOMAN= 1
+NOLINT=        1
 INCPATH=-I${.CURDIR} -I${.CURDIR}/../libsa -I${.CURDIR}/../libbug \
        -I${.CURDIR}/../../include -I${S} -I${S}/lib/libsa
 CFLAGS=        -O2 ${INCPATH} ${DEFS} ${COPTS}
@@ -15,20 +17,13 @@
 .include "${S}/arch/mvme68k/stand/libsa/Makefile.inc"
 
 SRCS=   bootxx.c conf.c version.c
-
+PROG=  bootxx
 LIBS=  ${LIBSA} ${LIBBUG}
 
-OBJS= ${SRCS:N*.h:R:S/$/.o/g}
-
-BOOTS= bootxx
-ALL=   ${BOOTS} 
-
-all: ${ALL}
-
-bootxx: ${OBJS} ${BUGCRT} ${LIBS}
+${PROG}: ${OBJS} ${BUGCRT} ${LIBS}
        ${LD} -N -T ${RELOC} ${BUGCRT} ${OBJS} ${LIBS} -o $@
 
 install:
-       ${INSTALL} -c -m 555 -g bin -o bin ${BOOTS} ${DESTDIR}${MDEC_DIR}
+       ${INSTALL} -c -m 555 -g bin -o bin ${PROG} ${DESTDIR}${MDEC_DIR}
 
 .include <bsd.prog.mk>
diff -r 141183ec5f9a -r 0fdc5b121347 sys/arch/mvme68k/stand/bugcrt/Makefile
--- a/sys/arch/mvme68k/stand/bugcrt/Makefile    Mon Jun 26 18:13:13 2000 +0000
+++ b/sys/arch/mvme68k/stand/bugcrt/Makefile    Mon Jun 26 18:14:03 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 1997/05/09 07:50:31 mycroft Exp $
+#      $NetBSD: Makefile,v 1.3.36.1 2000/06/26 18:14:50 scw Exp $
 #
 # DO NOT OPTMIZE bugcrt (i.e. no "-O2")
 #
@@ -8,7 +8,7 @@
 
 CLEANFILES+=a.out
 
-all:   ${OBJS}
+realall:       ${OBJS}
 
 bugcrt.o: bugcrt.c
        ${CC} ${CFLAGS} -c ${.ALLSRC}



Home | Main Index | Thread Index | Old Index