Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/x68k/stand libsa/Makefile: Fix rules to create syml...



details:   https://anonhg.NetBSD.org/src/rev/7a52fa3c3db3
branches:  trunk
changeset: 526528:7a52fa3c3db3
user:      isaki <isaki%NetBSD.org@localhost>
date:      Sun May 05 11:46:29 2002 +0000

description:
libsa/Makefile: Fix rules to create symlinks on read-only source tree.
{boot,libsa,mboot}/Makefile, Makefile.booters:
 move that common rule to Makefile.booters

diffstat:

 sys/arch/x68k/stand/Makefile.booters |  16 ++++++++++++++++
 sys/arch/x68k/stand/boot/Makefile    |  11 ++---------
 sys/arch/x68k/stand/libsa/Makefile   |  10 ++--------
 sys/arch/x68k/stand/mboot/Makefile   |  12 ++----------
 4 files changed, 22 insertions(+), 27 deletions(-)

diffs (95 lines):

diff -r 8fbcc4b9975e -r 7a52fa3c3db3 sys/arch/x68k/stand/Makefile.booters
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/x68k/stand/Makefile.booters      Sun May 05 11:46:29 2002 +0000
@@ -0,0 +1,16 @@
+#      $NetBSD: Makefile.booters,v 1.1 2002/05/05 11:46:29 isaki Exp $
+
+S?=    ${.CURDIR}/../../../..
+
+.PHONY:        machine-links
+
+machine-links:
+       -rm -f machine && \
+       ln -s $S/arch/${MACHINE}/include machine
+       -rm -f ${MACHINE_ARCH} && \
+       ln -s $S/arch/${MACHINE_ARCH}/include ${MACHINE_ARCH}
+
+CLEANFILES+=   machine ${MACHINE_ARCH}
+
+beforedepend:  machine-links
+
diff -r 8fbcc4b9975e -r 7a52fa3c3db3 sys/arch/x68k/stand/boot/Makefile
--- a/sys/arch/x68k/stand/boot/Makefile Sun May 05 11:23:24 2002 +0000
+++ b/sys/arch/x68k/stand/boot/Makefile Sun May 05 11:46:29 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2001/12/12 12:24:26 lukem Exp $
+#      $NetBSD: Makefile,v 1.9 2002/05/05 11:46:30 isaki Exp $
 
 NOMAN=         # defined
 
@@ -47,14 +47,7 @@
 LIBSA!=                cd $M/stand/libsa && ${PRINTOBJDIR}
 LDLIBS=                -L${LIBSA} -lsa -L${LIBIOCS} -liocs
 
-.PHONY:        machine-links
-beforedepend: machine-links
-machine-links:
-       -rm -f machine && \
-           ln -s $M/include machine
-       -rm -f ${MACHINE_ARCH} && \
-           ln -s $S/arch/${MACHINE_ARCH}/include ${MACHINE_ARCH}
-CLEANFILES+=   machine ${MACHINE_ARCH}
+.include "../Makefile.booters"
 
 realall: machine-links ${PROG}
 ${PROG}:       ${OBJS}
diff -r 8fbcc4b9975e -r 7a52fa3c3db3 sys/arch/x68k/stand/libsa/Makefile
--- a/sys/arch/x68k/stand/libsa/Makefile        Sun May 05 11:23:24 2002 +0000
+++ b/sys/arch/x68k/stand/libsa/Makefile        Sun May 05 11:46:29 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.10 2001/12/12 01:49:58 tv Exp $
+#      $NetBSD: Makefile,v 1.11 2002/05/05 11:46:30 isaki Exp $
 
 S=             ${.CURDIR}/../../../..
 LIBSADIR=      $S/lib/libsa
@@ -39,13 +39,7 @@
 
 .PATH: ${LIBSADIR} ${LIBKERNDIR} ${LIBZDIR}
 
-.if !make(obj)
-.BEGIN:
-       @([ -h machine ] || ln -s ${S}/arch/${MACHINE}/include machine)
-       @([ -h ${MACHINE_ARCH} ] || ln -s ${S}/arch/${MACHINE_ARCH}/include ${MACHINE_ARCH})
-.NOPATH: machine m68k
-CLEANFILES+= machine m68k
-.endif
+.include "../Makefile.booters"
 
 # only needed during build
 libinstall::
diff -r 8fbcc4b9975e -r 7a52fa3c3db3 sys/arch/x68k/stand/mboot/Makefile
--- a/sys/arch/x68k/stand/mboot/Makefile        Sun May 05 11:23:24 2002 +0000
+++ b/sys/arch/x68k/stand/mboot/Makefile        Sun May 05 11:46:29 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.9 2001/12/12 01:49:56 tv Exp $
+#      $NetBSD: Makefile,v 1.10 2002/05/05 11:46:30 isaki Exp $
 
 BOOT=          mboot
 VERSION=       0.1
@@ -26,15 +26,7 @@
 
 LDFLAGS=       -N -static -Ttext ${TEXT}
 
-.PHONY:        machine-links
-beforedepend: machine-links
-machine-links:
-       echo ${.CURDIR}
-       -rm -f machine && \
-           ln -s ${KERN}/arch/${MACHINE}/include machine
-       -rm -f ${MACHINE_ARCH} && \
-           ln -s ${KERN}/arch/${MACHINE_ARCH}/include ${MACHINE_ARCH}
-CLEANFILES+=   machine ${MACHINE_ARCH}
+.include "../Makefile.booters"
 
 realall: machine-links ${PROG}
 ${BOOT}:       ${OBJS}



Home | Main Index | Thread Index | Old Index