[src/trunk]: src/sys/arch/m68k/fpsp support building fpsp with MAKEOBJDIRPREFIX.

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

details:   https://anonhg.NetBSD.org/src/rev/a04610b618a5
branches:  trunk
changeset: 515692:a04610b618a5
user:      chs <chs%NetBSD.org@localhost>
date:      Tue Oct 02 06:34:52 2001 +0000

description:
support building fpsp with MAKEOBJDIRPREFIX.

diffstat:

 sys/arch/m68k/fpsp/Makefile     |  14 +++++++++-----
 sys/arch/m68k/fpsp/Makefile.inc |  15 ++++++++++-----
 sys/arch/m68k/fpsp/netbsd.sa    |   4 ++--
 3 files changed, 21 insertions(+), 12 deletions(-)

diffs (92 lines):

diff -r f2291a1a821c -r a04610b618a5 sys/arch/m68k/fpsp/Makefile
--- a/sys/arch/m68k/fpsp/Makefile       Tue Oct 02 06:30:03 2001 +0000
+++ b/sys/arch/m68k/fpsp/Makefile       Tue Oct 02 06:34:52 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 1997/09/18 22:55:56 jeremy Exp $
+#      $NetBSD: Makefile,v 1.8 2001/10/02 06:34:52 chs Exp $
 
 #      MOTOROLA MICROPROCESSOR & MEMORY TECHNOLOGY GROUP
 #      M68000 Hi-Performance Microprocessor Division
@@ -38,6 +38,12 @@
 
 TARGET = fpsp
 
+.SUFFIXES:     .o .s .sa .defs .h
+
+.PATH.h: ${FPSPDIR}
+.PATH.s: ${FPSPDIR}
+.PATH.sa: ${FPSPDIR}
+
 AS             = ${CC} -x assembler-with-cpp -traditional-cpp -c -m68040 -I${.CURDIR}
 LD?            = ld
 
@@ -65,12 +71,10 @@
 SYS            = GCC
 PREFIX         = L_
 
-.SUFFIXES:     .o .s .sa .defs .h
-
 .sa.s:
-       sh ${.CURDIR}/asm2gas ${.IMPSRC} >${.TARGET}
+       sh ${FPSPDIR}/asm2gas ${.IMPSRC} >${.TARGET}
 .h.defs:
-       sh ${.CURDIR}/asm2gas ${.IMPSRC} >${.TARGET}
+       sh ${FPSPDIR}/asm2gas ${.IMPSRC} >${.TARGET}
 .s.o:
        $(AS) -o ${.TARGET} ${.IMPSRC}
 
diff -r f2291a1a821c -r a04610b618a5 sys/arch/m68k/fpsp/Makefile.inc
--- a/sys/arch/m68k/fpsp/Makefile.inc   Tue Oct 02 06:30:03 2001 +0000
+++ b/sys/arch/m68k/fpsp/Makefile.inc   Tue Oct 02 06:34:52 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.11 2000/05/14 14:13:56 minoura Exp $
+#      $NetBSD: Makefile.inc,v 1.12 2001/10/02 06:34:52 chs Exp $
 #
 #      Configuration variables (default values are below):
 #
@@ -16,8 +16,9 @@
 
 # Default values:
 FPSPDST?=      ${.OBJDIR}/lib/fpsp
+FPSPDOTDIR?= ../../.
 
-FPSPDIR=       $S/arch/m68k/fpsp
+FPSPDIR=       ${S:S@^.@${FPSPDOTDIR}@:Q}/arch/m68k/fpsp
 FPSPOBJ=       ${FPSPDST}/fpsp.o
 FPSP!= printf "\#include \"opt_fpsp.h\"\n\#ifdef FPSP\n${FPSPOBJ}\n\#endif\n" | ${CPP} -P
 
@@ -27,9 +28,13 @@
 #          LD=${LD:Q} STRIP=${STRIP:Q} \
 
 FPSPMAKE= \
-       cd ${FPSPDIR} && MAKEOBJDIR=${FPSPDST} ${MAKE} .OBJDIR=${FPSPDST} \
-           MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH:Q} \
-           FPSPCPPFLAGS=${CPPFLAGS:S@^-I.@-I../../.@g:Q} \
+       cd ${FPSPDST} && ${MAKE} -f ${FPSPDIR:Q}/Makefile \
+           FPSPDIR=${FPSPDIR:Q} \
+           CC=${CC:Q} CFLAGS=${CFLAGS:Q} \
+           LD=${LD:Q} STRIP=${STRIP:Q} \
+           MACHINE=${MACHINE} \
+           MACHINE_ARCH=${MACHINE_ARCH:Q} \
+           FPSPCPPFLAGS=${CPPFLAGS:S@^-I.@-I${FPSPDOTDIR}@g:Q} \
            FPSPMISCCPPFLAGS=${FPSPMISCCPPFLAGS:Q} \
            FPSPDIR=${FPSPDIR:Q} \
            ${FPSPMISCMAKEFLAGS}
diff -r f2291a1a821c -r a04610b618a5 sys/arch/m68k/fpsp/netbsd.sa
--- a/sys/arch/m68k/fpsp/netbsd.sa      Tue Oct 02 06:30:03 2001 +0000
+++ b/sys/arch/m68k/fpsp/netbsd.sa      Tue Oct 02 06:34:52 2001 +0000
@@ -1,4 +1,4 @@
-*      $NetBSD: netbsd.sa,v 1.4 2001/09/16 16:34:32 wiz Exp $
+*      $NetBSD: netbsd.sa,v 1.5 2001/10/02 06:34:52 chs Exp $
 
 *      MOTOROLA MICROPROCESSOR & MEMORY TECHNOLOGY GROUP
 *      M68000 Hi-Performance Microprocessor Division
@@ -73,7 +73,7 @@
 *
 * XXX Note, this is NOT valid Motorola syntax, but what else can we do?
 *
-#include "../include/asm.h"
+#include <machine/asm.h>
 
        xref    b1238_fix
        xref    _C_LABEL(mmutype)