From 22ddeb4b77ea18ea5eb85efb915f93a1e33d9f0a Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Sun, 26 Dec 1999 17:07:15 +0000
Subject: [PATCH] Fixed stripping of aout debugging kernels. Fixed some style
 bugs (always use precisely 1 space after `:' in dependency specifications).
 Removed bogus dependency of ${FULLKERNEL} on ${BEFORE_DEPEND}.

---
 sys/conf/Makefile.i386      | 8 ++++----
 sys/conf/Makefile.powerpc   | 8 ++++----
 sys/i386/conf/Makefile.i386 | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 4086ac740b9b..e683d329b92c 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -120,22 +120,22 @@ SYSTEM_DEP+= $S/i386/conf/kernel.script
 
 %CLEAN
 
-all:	${KERNEL}
+all: ${KERNEL}
 
 .if !defined(DEBUG)
 FULLKERNEL=	${KERNEL}
 .else
 FULLKERNEL=	${KERNEL}.debug
-${KERNEL}:	${FULLKERNEL}
+${KERNEL}: ${FULLKERNEL}
 .if ${KERNFORMAT} == "elf"
 	objcopy --strip-debug ${FULLKERNEL} ${KERNEL}
 .else
 	cp ${FULLKERNEL} ${KERNEL}
-	strip -d ${KERNEL}
+	strip -aout -d ${KERNEL}
 .endif
 .endif
 
-${FULLKERNEL}:	${BEFORE_DEPEND} ${SYSTEM_DEP} vers.o
+${FULLKERNEL}: ${SYSTEM_DEP} vers.o
 	@rm -f ${.TARGET}
 	@echo linking ${.TARGET}
 	${SYSTEM_LD}
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index 4086ac740b9b..e683d329b92c 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -120,22 +120,22 @@ SYSTEM_DEP+= $S/i386/conf/kernel.script
 
 %CLEAN
 
-all:	${KERNEL}
+all: ${KERNEL}
 
 .if !defined(DEBUG)
 FULLKERNEL=	${KERNEL}
 .else
 FULLKERNEL=	${KERNEL}.debug
-${KERNEL}:	${FULLKERNEL}
+${KERNEL}: ${FULLKERNEL}
 .if ${KERNFORMAT} == "elf"
 	objcopy --strip-debug ${FULLKERNEL} ${KERNEL}
 .else
 	cp ${FULLKERNEL} ${KERNEL}
-	strip -d ${KERNEL}
+	strip -aout -d ${KERNEL}
 .endif
 .endif
 
-${FULLKERNEL}:	${BEFORE_DEPEND} ${SYSTEM_DEP} vers.o
+${FULLKERNEL}: ${SYSTEM_DEP} vers.o
 	@rm -f ${.TARGET}
 	@echo linking ${.TARGET}
 	${SYSTEM_LD}
diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386
index 4086ac740b9b..e683d329b92c 100644
--- a/sys/i386/conf/Makefile.i386
+++ b/sys/i386/conf/Makefile.i386
@@ -120,22 +120,22 @@ SYSTEM_DEP+= $S/i386/conf/kernel.script
 
 %CLEAN
 
-all:	${KERNEL}
+all: ${KERNEL}
 
 .if !defined(DEBUG)
 FULLKERNEL=	${KERNEL}
 .else
 FULLKERNEL=	${KERNEL}.debug
-${KERNEL}:	${FULLKERNEL}
+${KERNEL}: ${FULLKERNEL}
 .if ${KERNFORMAT} == "elf"
 	objcopy --strip-debug ${FULLKERNEL} ${KERNEL}
 .else
 	cp ${FULLKERNEL} ${KERNEL}
-	strip -d ${KERNEL}
+	strip -aout -d ${KERNEL}
 .endif
 .endif
 
-${FULLKERNEL}:	${BEFORE_DEPEND} ${SYSTEM_DEP} vers.o
+${FULLKERNEL}: ${SYSTEM_DEP} vers.o
 	@rm -f ${.TARGET}
 	@echo linking ${.TARGET}
 	${SYSTEM_LD}