From 1d86aba60b12cb5bca2a53be124d94bfc9bc8857 Mon Sep 17 00:00:00 2001
From: Garrett Wollman <wollman@FreeBSD.org>
Date: Thu, 11 May 1995 19:48:45 +0000
Subject: [PATCH] Make `make links' work by leaving swapkernel.c off out of the
 links processing (it is never generic).

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

diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 14f83083008..e81caf3e36e 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -1,6 +1,6 @@
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.61 1995/04/03 01:13:50 nate Exp $
+#	$Id: Makefile.i386,v 1.62 1995/04/05 04:10:58 nate Exp $
 #
 # Makefile for FreeBSD
 #
@@ -161,9 +161,9 @@ depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND}
 	mkdep -a -DLOCORE ${COPTS} ${SFILES} ${SYSTEM_SFILES}
 
 links:
-	egrep '#if' ${CFILES} | sed -f $S/conf/defines | \
+	egrep '#if' ${CFILES:Nswapkernel.c} | sed -f $S/conf/defines | \
 	  sed -e 's/:.*//' -e 's/\.c/.o/' | sort -u > dontlink
-	echo ${CFILES} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
+	echo ${CFILES:Nswapkernel.c} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
 	  sort -u | comm -23 - dontlink | \
 	  sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks
 	sh makelinks && rm -f dontlink
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index 14f83083008..e81caf3e36e 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -1,6 +1,6 @@
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.61 1995/04/03 01:13:50 nate Exp $
+#	$Id: Makefile.i386,v 1.62 1995/04/05 04:10:58 nate Exp $
 #
 # Makefile for FreeBSD
 #
@@ -161,9 +161,9 @@ depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND}
 	mkdep -a -DLOCORE ${COPTS} ${SFILES} ${SYSTEM_SFILES}
 
 links:
-	egrep '#if' ${CFILES} | sed -f $S/conf/defines | \
+	egrep '#if' ${CFILES:Nswapkernel.c} | sed -f $S/conf/defines | \
 	  sed -e 's/:.*//' -e 's/\.c/.o/' | sort -u > dontlink
-	echo ${CFILES} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
+	echo ${CFILES:Nswapkernel.c} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
 	  sort -u | comm -23 - dontlink | \
 	  sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks
 	sh makelinks && rm -f dontlink
diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386
index 14f83083008..e81caf3e36e 100644
--- a/sys/i386/conf/Makefile.i386
+++ b/sys/i386/conf/Makefile.i386
@@ -1,6 +1,6 @@
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.61 1995/04/03 01:13:50 nate Exp $
+#	$Id: Makefile.i386,v 1.62 1995/04/05 04:10:58 nate Exp $
 #
 # Makefile for FreeBSD
 #
@@ -161,9 +161,9 @@ depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND}
 	mkdep -a -DLOCORE ${COPTS} ${SFILES} ${SYSTEM_SFILES}
 
 links:
-	egrep '#if' ${CFILES} | sed -f $S/conf/defines | \
+	egrep '#if' ${CFILES:Nswapkernel.c} | sed -f $S/conf/defines | \
 	  sed -e 's/:.*//' -e 's/\.c/.o/' | sort -u > dontlink
-	echo ${CFILES} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
+	echo ${CFILES:Nswapkernel.c} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
 	  sort -u | comm -23 - dontlink | \
 	  sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks
 	sh makelinks && rm -f dontlink