[src/trunk]: src/sys/arch/next68k/stand/boot use ${.OBJDIR} rather than ${.CU...

[jdolecek <jdolecek%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/99d12d37e84d
branches:  trunk
changeset: 526679:99d12d37e84d
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Wed May 08 11:27:30 2002 +0000

description:
use ${.OBJDIR} rather than ${.CURDIR}/obj.${MACHINE} (eek)
g/c -I${.CURDIR} and -I${S}/lib/libkern from ${INCLUDES}
build libsa dev_net.c via .PATH and SRCS rather than special rules

diffstat:

 sys/arch/next68k/stand/boot/Makefile |  14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

diffs (51 lines):

diff -r 8ed07e1ee239 -r 99d12d37e84d sys/arch/next68k/stand/boot/Makefile
--- a/sys/arch/next68k/stand/boot/Makefile      Wed May 08 07:57:09 2002 +0000
+++ b/sys/arch/next68k/stand/boot/Makefile      Wed May 08 11:27:30 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.11 2002/05/07 09:03:52 jdolecek Exp $
+#      $NetBSD: Makefile,v 1.12 2002/05/08 11:27:30 jdolecek Exp $
 
 S=     ${.CURDIR}/../../../..
 
@@ -21,7 +21,7 @@
 RELOC= 4380000
 
 # XXX make defs arch-indep.
-INCLUDES+=     -I${.CURDIR} -I${.CURDIR}/obj.${MACHINE} -I${S}/arch -I${S} -I${S}/lib/libsa -I${S}/lib/libkern
+INCLUDES+=     -I${.OBJDIR} -I${S}/arch -I${S} -I${S}/lib/libsa 
 DEFS+=         -D_STANDALONE -DMC68040 -DSUPPORT_BOOTP -DSUPPORT_DHCP  -DDEBUG -DSD_DEBUG -DSCSI_DEBUG # -DEN_DEBUG   -DNETIF_DEBUG  
 SAMISCCPPFLAGS=        -DSUPPORT_DHCP -DSUPPORT_BOOTP -DINSECURE # -DBOOTP_DEBUG -DETHER_DEBUG -DNET_DEBUG # -DNETIF_DEBUG -DNFS_DEBUG  -DARP_DEBUG 
 WARNS=1
@@ -30,8 +30,11 @@
 
 PROG=  boot
 SRCS=   boot.c machdep.c conf.c devopen.c rtc.c sd.c scsi.c en.c vers.c build.c
+
 # @@@ dev_net.c should really be in libsa, but it doesn't
 # declare ip_convertaddr correctly, so I put it here _temporarily_.
+.PATH: ${S}/lib/libsa
+SRCS+= dev_net.c
 
 CLEANFILES+= srt0.o boot.elf boot.raw machine ${MACHINE_ARCH} limits.h
 CLEANFILES+= vers.c build.c build      # generated dynamically
@@ -41,8 +44,6 @@
 #LIBS= ${SALIB} ${KERNLIB} ${ZLIB}
 LIBS=  ${SALIB} ${KERNLIB}
 
-OBJS+= dev_net.o
-
 AWKPROG='\
 function x(v) { printf "\0%c%c%c", v / 65536, v / 256, v } \
 { \
@@ -59,11 +60,6 @@
        @${OBJCOPY} -O binary $@.elf $@.raw
        @(${SIZE} $@.elf | tail +2 | awk ${AWKPROG} ; cat $@.raw) > $@
 
-# this looks useful to me ... let's see when it will be an official part
-# of libsa
-dev_net.o : ${S}/lib/libsa/dev_net.c
-       ${COMPILE.c} ${.IMPSRC}
-
 # startup
 
 srt0.o: ${.CURDIR}/srt0.s