summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2001-08-22 18:10:21 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2001-08-22 18:10:21 +0000
commit653f3e9b967606e21d466994a6d22ab78dcb2a72 (patch)
treeb2e9089f226801f62058fdb4609ff90d185623fc /sys/arch
parent7ec0b9cd922be19aa300ba8f05570557ce9d99b2 (diff)
Modify fpsp and 060sp makefiles, so that they honor obj/ directories
and get cleaned as part of the kernel clean rule. Agreed by millert@ and jj@
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/m68k/060sp/Makefile.inc14
-rw-r--r--sys/arch/m68k/fpsp/Makefile.inc13
2 files changed, 20 insertions, 7 deletions
diff --git a/sys/arch/m68k/060sp/Makefile.inc b/sys/arch/m68k/060sp/Makefile.inc
index 2c764e653c8..52d9c74cf7e 100644
--- a/sys/arch/m68k/060sp/Makefile.inc
+++ b/sys/arch/m68k/060sp/Makefile.inc
@@ -1,5 +1,4 @@
-#
-# $OpenBSD: Makefile.inc,v 1.3 1997/07/06 07:46:18 downsj Exp $
+# $OpenBSD: Makefile.inc,v 1.4 2001/08/22 18:10:17 miod Exp $
# $NetBSD: Makefile.inc,v 1.2 1997/05/07 07:15:43 mycroft Exp $
#
# NOTE: $S must correspond to the top of the `sys' tree
@@ -11,9 +10,16 @@
060SPOBJ= $(060SPOBJDIR)/060sp.o
-$(060SPOBJ): .NOTMAIN __always_make_060sp
+060SPMAKE= \
+ cd ${060SPSRCDIR} && MAKEOBJDIR=${060SPOBJDIR} ${MAKE}
+
+$(060SPOBJ): .NOTMAIN __always_make_060sp
@echo making sure the 060sp is up to date...
- @(cd $(060SPSRCDIR) ; $(MAKE))
+ @${060SPMAKE}
+
+clean:: .NOTMAIN __always_make_060sp
+ @echo cleaning the 060sp objects
+ @${060SPMAKE} clean
060SP!= printf "\#ifdef M060SP\n${060SPOBJ}\n\#endif\n" | cpp -P -undef ${CPPFLAGS:M-DM060SP}
diff --git a/sys/arch/m68k/fpsp/Makefile.inc b/sys/arch/m68k/fpsp/Makefile.inc
index d1c2f782316..6dc170ef1e6 100644
--- a/sys/arch/m68k/fpsp/Makefile.inc
+++ b/sys/arch/m68k/fpsp/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.4 1997/07/06 07:46:21 downsj Exp $
+# $OpenBSD: Makefile.inc,v 1.5 2001/08/22 18:10:20 miod Exp $
# $NetBSD: Makefile.inc,v 1.5 1997/05/07 07:15:44 mycroft Exp $
#
# NOTE: $S must correspond to the top of the `sys' tree
@@ -10,9 +10,16 @@ FPSPOBJDIR!= cd $(FPSPSRCDIR); \
FPSPOBJ= $(FPSPOBJDIR)/fpsp.o
-$(FPSPOBJ): .NOTMAIN __always_make_fpsp
+FPSPMAKE= \
+ cd ${FPSPSRCDIR} && MAKEOBJDIR=${FPSPOBJDIR} ${MAKE}
+
+$(FPSPOBJ): .NOTMAIN __always_make_fpsp
@echo making sure the fpsp is up to date...
- @(cd $(FPSPSRCDIR); $(MAKE))
+ @${FPSPMAKE}
+
+clean:: .NOTMAIN __always_make_fpsp
+ @echo cleaning the fpsp objects
+ @${FPSPMAKE} clean
FPSP!= printf "\#ifdef FPSP\n${FPSPOBJ}\n\#endif\n" | ${CPP} -P -undef ${CPPFLAGS:M-DFPSP}