Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/news68k/stand Rework dependencies for PROG. Needs L...



details:   https://anonhg.NetBSD.org/src/rev/22679adf4a11
branches:  trunk
changeset: 580857:22679adf4a11
user:      jmc <jmc%NetBSD.org@localhost>
date:      Wed May 11 18:36:10 2005 +0000

description:
Rework dependencies for PROG. Needs LIBS, not machine/m68k for -j to work

diffstat:

 sys/arch/news68k/stand/boot/Makefile   |  4 ++--
 sys/arch/news68k/stand/bootxx/Makefile |  8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (55 lines):

diff -r 606095bd6298 -r 22679adf4a11 sys/arch/news68k/stand/boot/Makefile
--- a/sys/arch/news68k/stand/boot/Makefile      Wed May 11 18:14:49 2005 +0000
+++ b/sys/arch/news68k/stand/boot/Makefile      Wed May 11 18:36:10 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.19 2005/05/11 18:14:49 jmc Exp $
+#      $NetBSD: Makefile,v 1.20 2005/05/11 18:36:30 jmc Exp $
 
 NOMAN= # defined
 
@@ -41,7 +41,7 @@
        -rm -f $@
        ln -s ${S}/arch/m68k/include $@
 
-${PROG}: ${OBJS} machine m68k
+${PROG}: ${OBJS} ${LIBS}
        ${LD} ${LDFLAGS} -o ${.TARGET}.sym ${OBJS} ${LIBS}
        -${SIZE} ${.TARGET}.sym
        ${OBJCOPY} -O binary ${.TARGET}.sym ${.TARGET}
diff -r 606095bd6298 -r 22679adf4a11 sys/arch/news68k/stand/bootxx/Makefile
--- a/sys/arch/news68k/stand/bootxx/Makefile    Wed May 11 18:14:49 2005 +0000
+++ b/sys/arch/news68k/stand/bootxx/Makefile    Wed May 11 18:36:10 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.12 2005/05/11 18:15:40 jmc Exp $
+#      $NetBSD: Makefile,v 1.13 2005/05/11 18:36:10 jmc Exp $
 
 NOMAN= # defined
 
@@ -18,7 +18,7 @@
 SIZE?= size
 OBJCOPY?= objcopy
 
-S= ${.CURDIR}/../../../..
+S!= cd ${.CURDIR}/../../../..; pwd
 
 LDFLAGS= -x -N -Ttext 0 -e start
 CFLAGS= -Os -Wall
@@ -32,8 +32,8 @@
 L= ${COMMONOBJ}/lib
 LIBS= ${L}/sa/libsa.a ${L}/kern/libkern.a
 
+.BEGIN: machine m68k
 .NOPATH: machine m68k
-.BEGIN: machine m68k
 
 machine::
        -rm -f $@
@@ -43,7 +43,7 @@
        -rm -f $@
        ln -s ${S}/arch/m68k/include $@
 
-${PROG}: ${OBJS} machine m68k
+${PROG}: ${OBJS} ${LIBS}
        ${LD} ${LDFLAGS} -o ${.TARGET}.sym ${OBJS} ${LIBS}
        ${SIZE} ${.TARGET}.sym
        ${OBJCOPY} -O binary ${.TARGET}.sym ${.TARGET}



Home | Main Index | Thread Index | Old Index