From cf532aa7eb2a8a0cb1058db1fee8f16bdbbc83b4 Mon Sep 17 00:00:00 2001
From: tsubai <tsubai@NetBSD.org>
Date: Mon, 7 Feb 2000 16:26:59 +0000
Subject: [PATCH] Move CFLAGS and CPPFLAGS to {bootxx,ofwboot}/Makefile to
 compile installboot without -D_STANDALONE.

---
 sys/arch/macppc/stand/Makefile.inc     | 6 +-----
 sys/arch/macppc/stand/bootxx/Makefile  | 5 +++--
 sys/arch/macppc/stand/ofwboot/Makefile | 8 ++++++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/sys/arch/macppc/stand/Makefile.inc b/sys/arch/macppc/stand/Makefile.inc
index 4cd6ec605631..f522c5fde883 100644
--- a/sys/arch/macppc/stand/Makefile.inc
+++ b/sys/arch/macppc/stand/Makefile.inc
@@ -1,7 +1,3 @@
-#	$NetBSD: Makefile.inc,v 1.2 1998/05/22 12:56:36 drochner Exp $
+#	$NetBSD: Makefile.inc,v 1.3 2000/02/07 16:26:59 tsubai Exp $
 
 BINDIR=		/usr/mdec
-
-CPPFLAGS+=	-D_STANDALONE
-
-CFLAGS+=	-msoft-float
diff --git a/sys/arch/macppc/stand/bootxx/Makefile b/sys/arch/macppc/stand/bootxx/Makefile
index 78671608110d..d01d0b762cf2 100644
--- a/sys/arch/macppc/stand/bootxx/Makefile
+++ b/sys/arch/macppc/stand/bootxx/Makefile
@@ -1,11 +1,12 @@
-#	$NetBSD: Makefile,v 1.3 1999/05/06 01:04:48 wrstuden Exp $
+#	$NetBSD: Makefile,v 1.4 2000/02/07 16:27:00 tsubai Exp $
 
 PROG= bootxx
 MKMAN=	no
 STRIPFLAG=
 BINMODE=444
 
-CFLAGS=-O2 -Wall
+CFLAGS= -O2 -Wall -msoft-float
+CPPFLAGS+= -D_STANDALONE
 
 ${PROG}: ${PROG}.o
 	${LD} -o bootxx -x -N -Ttext 4000 -e _start ${PROG}.o
diff --git a/sys/arch/macppc/stand/ofwboot/Makefile b/sys/arch/macppc/stand/ofwboot/Makefile
index c0c306e8c2b5..4af084d8f617 100644
--- a/sys/arch/macppc/stand/ofwboot/Makefile
+++ b/sys/arch/macppc/stand/ofwboot/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 2000/01/23 17:04:05 mycroft Exp $
+#	$NetBSD: Makefile,v 1.9 2000/02/07 16:27:00 tsubai Exp $
 
 S=	${.CURDIR}/../../../..
 
@@ -7,9 +7,13 @@ FILES=		${PROG}.elf
 SRCS=		Locore.c boot.c ofdev.c net.c netif_of.c alloc.c
 XCOFFXTRA=	Xcoffxtra.c
 XCOFFXTRAOBJ=	Xcoffxtra.o
+CFLAGS+=	-msoft-float
+#CFLAGS+=	-DDEBUG -DNETIF_DEBUG
+CPPFLAGS+=	-D_STANDALONE
+
 .PATH:		${S}/arch/powerpc/powerpc
 SRCS+=		ofwmagic.S
-#CFLAGS+=	-DDEBUG -DNETIF_DEBUG
+
 MKMAN=		no
 STRIPFLAG=
 BINMODE=	444