* Define CWARNFLAGS and MKDEP in some moderately consistent fashion.

* Make S expand to an absolute path at compile time. * Use `-S' rather than `-x' to remove debugging symbols. * Garbage collect unused variables. * Reverse a handful of port-specific changes that do not correspond to the common build model and are not needed.
1996-08-10 05:29:24 +00:00 · 1996-08-10 05:29:24 +00:00 · f94052ed3a
parent 811315ca92
commit f94052ed3a
15 changed files with 261 additions and 304 deletions
--- a/sys/arch/alpha/conf/Makefile.alpha
+++ b/sys/arch/alpha/conf/Makefile.alpha
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.alpha,v 1.18 1996/07/14 20:20:10 cgd Exp $
+#	$NetBSD: Makefile.alpha,v 1.19 1996/08/10 05:29:24 mycroft Exp $

 # Makefile for NetBSD
 #
@ -21,21 +21,20 @@
 # DEBUG is set to -g if debugging.
 # PROF is set to -pg if profiling.

-AS?=	as
 CC?=	cc
-CPP?=	cpp
 LD?=	ld
+MKDEP?=	mkdep
 STRIP?=	strip -g -X -x
 TOUCH?=	touch -f -c

 # source tree is located via $S relative to the compilation directory
-S=	../../../..
-ALPHA=	../..
+S!=	cd ../../../..; pwd
+ALPHA=	$S/arch/alpha

 INCLUDES=	-I. -I$S/arch -I$S
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -Dalpha
-CWARNFLAGS?=	-Werror -Wall -Wstrict-prototypes -Wmissing-prototypes
-CFLAGS=		${DEBUG} -O2 -mno-fp-regs ${CWARNFLAGS}
+CWARNFLAGS=	-Werror -Wall -Wstrict-prototypes -Wmissing-prototypes
+CFLAGS=		${DEBUG} ${CWARNFLAGS} -O2 -mno-fp-regs
 AFLAGS=		-x assembler-with-cpp -traditional-cpp -D_LOCORE
 LINKFLAGS=	-N -Ttext fffffc0000230000 -e __start -G 4

@ -95,7 +94,7 @@ SYSTEM_LD_TAIL+=; \
 		echo cp $@ $@.gdb; rm -f $@.gdb; cp $@ $@.gdb; \
 		echo ${STRIP} $@; ${STRIP} $@
 .else
-LINKFLAGS+=	-x
+LINKFLAGS+=	-S
 .endif

 %LOAD
@ -149,10 +148,10 @@ SRCS=	${ALPHA}/alpha/locore.s \
 	param.c ioconf.c ${CFILES} ${SFILES}
 depend:: .depend
 .depend: ${SRCS} assym.h param.c
-	mkdep ${AFLAGS} ${CPPFLAGS} ${ALPHA}/alpha/locore.s
-	mkdep -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
-	mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
-	mkdep -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${ALPHA}/alpha/genassym.c
+	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${ALPHA}/alpha/locore.s
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
+	${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${ALPHA}/alpha/genassym.c


 # depend on root or device configuration
--- a/sys/arch/amiga/conf/Makefile.amiga
+++ b/sys/arch/amiga/conf/Makefile.amiga
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.amiga,v 1.45 1996/05/16 17:07:08 is Exp $
+#	$NetBSD: Makefile.amiga,v 1.46 1996/08/10 05:29:28 mycroft Exp $

 # Makefile for NetBSD
 #
@ -21,29 +21,25 @@
 # DEBUG is set to -g if debugging.
 # PROF is set to -pg if profiling.

-AS?=	as
 CC?=	cc
-CPP?=	cpp
 LD?=	ld
+MKDEP?=	mkdep
 STRIP?=	strip -d
 TOUCH?=	touch -f -c

 # source tree is located via $S relative to the compilation directory
-S=	../../../..
-AMIGA=	../..
+S!=	cd ../../../..; pwd
+AMIGA=	$S/arch/amiga

 INCLUDES=	-I. -I$S/arch -I$S
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -Dmc68020 -Damiga
-
-CDIAGFLAGS=	-Werror -Wall -Wstrict-prototypes
-
+CWARNFLAGS=	-Werror -Wall -Wstrict-prototypes
 .if empty(IDENT:M-DM68060)
-CMACHFLAGS=	-m68020 -msoft-float
+CMACHFLAGS=	-m68020
 .else
-CMACHFLAGS=	-m68060 -Wa,-m68030 -msoft-float
+CMACHFLAGS=	-m68060 -Wa,-m68030
 .endif
-
-CFLAGS=		${DEBUG} -O2 ${CDIAGFLAGS} ${CMACHFLAGS} ${COPTS}
+CFLAGS=		${DEBUG} ${CWARNFLAGS} -O2 -msoft-float ${CMACHFLAGS}
 AFLAGS=		-x assembler-with-cpp -traditional-cpp -D_LOCORE
 LINKFLAGS=	-n -Ttext 0 -e start

@ -115,7 +111,7 @@ SYSTEM_LD_TAIL+=; \
 		echo cp $@ $@.gdb; rm -f $@.gdb; cp $@ $@.gdb; \
 		echo ${STRIP} $@; ${STRIP} $@
 .else
-LINKFLAGS+=	-x
+LINKFLAGS+=	-S
 .endif

 %LOAD
@ -169,10 +165,10 @@ SRCS=	${AMIGA}/amiga/locore.s \
 	param.c ioconf.c ${CFILES} ${SFILES}
 depend:: .depend
 .depend: ${SRCS} assym.h param.c
-	mkdep ${AFLAGS} ${CPPFLAGS} ${AMIGA}/amiga/locore.s
-	mkdep -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
-	mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
-	mkdep -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${AMIGA}/amiga/genassym.c
+	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${AMIGA}/amiga/locore.s
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
+	${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${AMIGA}/amiga/genassym.c


 # depend on root or device configuration
--- a/sys/arch/arm32/conf/Makefile.arm32
+++ b/sys/arch/arm32/conf/Makefile.arm32
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.arm32,v 1.12 1996/05/20 14:37:24 mark Exp $
+#	$NetBSD: Makefile.arm32,v 1.13 1996/08/10 05:29:30 mycroft Exp $

 # Makefile for NetBSD
 #
@ -21,20 +21,20 @@
 # DEBUG is set to -g if debugging.
 # PROF is set to -pg if profiling.

-AS?=	as
 CC?=	cc
-CPP?=	cpp
 LD?=	ld
+MKDEP?=	mkdep
 STRIP?=	strip -d
 TOUCH?=	touch -f -c

 # source tree is located via $S relative to the compilation directory
-S=	../../../..
-ARM32=	../..
+S!=	cd ../../../..; pwd
+ARM32=	$S/arch/arm32

 INCLUDES=	-I. -I$S/arch -I$S
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -Darm32
-CFLAGS=		${DEBUG} -O2 -Werror
+CWARNFLAGS=	-Werror
+CFLAGS=		${DEBUG} ${CWARNFLAGS} -O2 
 AFLAGS=		-x assembler-with-cpp -traditional-cpp -D_LOCORE
 LINKFLAGS=	-Ttext F0000020 -e start

@ -94,7 +94,7 @@ SYSTEM_LD_TAIL+=; \
 		echo cp $@ $@.gdb; rm -f $@.gdb; cp $@ $@.gdb; \
 		echo ${STRIP} $@; ${STRIP} $@
 .else
-LINKFLAGS+=	-x
+LINKFLAGS+=	-S
 .endif

 %LOAD
@ -148,11 +148,11 @@ SRCS=	${ARM32}/arm32/locore.S modedefs.c \
 	param.c ioconf.c ${CFILES} ${SFILES}
 depend:: .depend
 .depend: ${SRCS} assym.h param.c
-	mkdep ${AFLAGS} ${CPPFLAGS} ${ARM32}/arm32/locore.S
-	mkdep -a ${CFLAGS} ${CPPFLAGS} modedefs.c
-	mkdep -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
-	mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
-	mkdep -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${ARM32}/arm32/genassym.c
+	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${ARM32}/arm32/locore.S
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} modedefs.c
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
+	${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${ARM32}/arm32/genassym.c


 # depend on root or device configuration
--- a/sys/arch/atari/conf/Makefile.atari
+++ b/sys/arch/atari/conf/Makefile.atari
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.atari,v 1.18 1996/06/18 11:12:32 leo Exp $
+#	$NetBSD: Makefile.atari,v 1.19 1996/08/10 05:29:32 mycroft Exp $

 # Makefile for NetBSD
 #
@ -21,20 +21,20 @@
 # DEBUG is set to -g if debugging.
 # PROF is set to -pg if profiling.

-AS?=	as
 CC?=	cc
-CPP?=	cpp
 LD?=	ld
+MKDEP?=	mkdep
 STRIP?=	strip -d
 TOUCH?=	touch -f -c

 # source tree is located via $S relative to the compilation directory
-S=	../../../..
-ATARI=	../..
+S!=	cd ../../../..; pwd
+ATARI=	$S/arch/atari

 INCLUDES=	-I. -I$S/arch -I$S
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -Dmc68020 -Datari
-CFLAGS=		${DEBUG} -O2 -Werror -mc68020 -msoft-float
+CWARNFLAGS=	-Werror
+CFLAGS=		${DEBUG} ${CWARNFLAGS} -O2 -msoft-float -mc68020
 AFLAGS=		-x assembler-with-cpp -traditional-cpp -D_LOCORE
 LINKFLAGS=	-n -Ttext 0 -e start

@ -151,10 +151,10 @@ SRCS=	${ATARI}/atari/locore.s \
 	param.c ioconf.c ${CFILES} ${SFILES}
 depend:: .depend
 .depend: ${SRCS} assym.h param.c
-	mkdep ${AFLAGS} ${CPPFLAGS} ${ATARI}/atari/locore.s
-	mkdep -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
-	mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
-	mkdep -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${ATARI}/atari/genassym.c
+	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${ATARI}/atari/locore.s
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
+	${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${ATARI}/atari/genassym.c


 # depend on root or device configuration
--- a/sys/arch/hp300/conf/Makefile.hp300
+++ b/sys/arch/hp300/conf/Makefile.hp300
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.hp300,v 1.39 1996/05/11 16:12:02 mycroft Exp $
+#	$NetBSD: Makefile.hp300,v 1.40 1996/08/10 05:29:34 mycroft Exp $

 # Makefile for NetBSD
 #
@ -21,20 +21,20 @@
 # DEBUG is set to -g if debugging.
 # PROF is set to -pg if profiling.

-AS?=	as
 CC?=	cc
-CPP?=	cpp
 LD?=	ld
+MKDEP?=	mkdep
 STRIP?=	strip -d
 TOUCH?=	touch -f -c

 # source tree is located via $S relative to the compilation directory
-S=	../../../..
-HP300=	../..
+S!=	cd ../../../..; pwd
+HP300=	$S/arch/hp300

 INCLUDES=	-I. -I$S/arch -I$S
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -Dmc68020 -Dhp300 -DFPCOPROC
-CFLAGS=		${DEBUG} -O2 -Werror -msoft-float
+CWARNFLAGS=	-Werror
+CFLAGS=		${DEBUG} ${CWARNFLAGS} -O2 -msoft-float
 AFLAGS=		-x assembler-with-cpp -traditional-cpp -D_LOCORE
 LINKFLAGS=	-n -Ttext 0 -e start

@ -97,7 +97,7 @@ SYSTEM_LD_TAIL+=; \
 		echo cp $@ $@.gdb; rm -f $@.gdb; cp $@ $@.gdb; \
 		echo ${STRIP} $@; ${STRIP} $@
 .else
-LINKFLAGS+=	-x
+LINKFLAGS+=	-S
 .endif

 %LOAD
@ -151,12 +151,12 @@ SRCS=	${HP300}/hp300/locore.s \
 	param.c ioconf.c ${CFILES} ${SFILES}
 depend:: .depend
 .depend: ${SRCS} assym.h param.c
-	mkdep ${AFLAGS} ${CPPFLAGS} ${HP300}/hp300/locore.s
-	mkdep -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
+	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${HP300}/hp300/locore.s
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 	-if test -n "${SFILES}"; then \
-		mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}; \
+		${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}; \
 	fi
-	mkdep -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${HP300}/hp300/genassym.c
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${HP300}/hp300/genassym.c


 # depend on root or device configuration
--- a/sys/arch/i386/conf/Makefile.i386
+++ b/sys/arch/i386/conf/Makefile.i386
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.i386,v 1.67 1996/05/11 16:12:11 mycroft Exp $
+#	$NetBSD: Makefile.i386,v 1.68 1996/08/10 05:29:36 mycroft Exp $

 # Makefile for NetBSD
 #
@ -21,20 +21,20 @@
 # DEBUG is set to -g if debugging.
 # PROF is set to -pg if profiling.

-AS?=	as
 CC?=	cc
-CPP?=	cpp
 LD?=	ld
+MKDEP?=	mkdep
 STRIP?=	strip -d
 TOUCH?=	touch -f -c

 # source tree is located via $S relative to the compilation directory
-S=	../../../..
-I386=	../..
+S!=	cd ../../../..; pwd
+I386=	$S/arch/i386

 INCLUDES=	-I. -I$S/arch -I$S
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -Di386
-CFLAGS=		${DEBUG} -O2 -Werror
+CWARNFLAGS=	-Werror -Wreturn-type
+CFLAGS=		${DEBUG} ${CWARNFLAGS} -O2 
 AFLAGS=		-x assembler-with-cpp -traditional-cpp -D_LOCORE
 LINKFLAGS=	-z -Ttext F8100000 -e start

@ -94,7 +94,7 @@ SYSTEM_LD_TAIL+=; \
 		echo cp $@ $@.gdb; rm -f $@.gdb; cp $@ $@.gdb; \
 		echo ${STRIP} $@; ${STRIP} $@
 .else
-LINKFLAGS+=	-x
+LINKFLAGS+=	-S
 .endif

 %LOAD
@ -148,10 +148,10 @@ SRCS=	${I386}/i386/locore.s \
 	param.c ioconf.c ${CFILES} ${SFILES}
 depend:: .depend
 .depend: ${SRCS} assym.h param.c
-	mkdep ${AFLAGS} ${CPPFLAGS} ${I386}/i386/locore.s
-	mkdep -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
-	mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
-	mkdep -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${I386}/i386/genassym.c
+	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${I386}/i386/locore.s
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
+	${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${I386}/i386/genassym.c


 # depend on root or device configuration
--- a/sys/arch/mac68k/conf/Makefile.mac68k
+++ b/sys/arch/mac68k/conf/Makefile.mac68k
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.mac68k,v 1.38 1996/05/11 16:12:20 mycroft Exp $
+#	$NetBSD: Makefile.mac68k,v 1.39 1996/08/10 05:29:41 mycroft Exp $

 # Makefile for NetBSD
 #
@ -21,21 +21,20 @@
 # DEBUG is set to -g if debugging.
 # PROF is set to -pg if profiling.

-AS?=	as
 CC?=	cc
-CPP?=	cpp
 LD?=	ld
+MKDEP?=	mkdep
 STRIP?=	strip -d
 TOUCH?=	touch -f -c

 # source tree is located via $S relative to the compilation directory
-S=	../../../..
-MAC68K=	../..
+S!=	cd ../../../..; pwd
+MAC68K=	$S/arch/mac68k

 INCLUDES=	-I. -I$S/arch -I$S
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -Dmc68020 -Dmac68k
-GCCWFLAGS=	-Wall -Wstrict-prototypes -Wmissing-prototypes -Wno-uninitialized
-CFLAGS=		${DEBUG} -O ${GCCWFLAGS} -msoft-float
+CWARNFLAGS=	-Wall -Wstrict-prototypes -Wmissing-prototypes -Wno-uninitialized
+CFLAGS=		${DEBUG} ${CWARNFLAGS} -O -msoft-float
 AFLAGS=		-x assembler-with-cpp -traditional-cpp -D_LOCORE
 LINKFLAGS=	-n -Ttext 0 -e start

@ -98,7 +97,7 @@ SYSTEM_LD_TAIL+=; \
 		echo cp $@ $@.gdb; rm -f $@.gdb; cp $@ $@.gdb; \
 		echo ${STRIP} $@; ${STRIP} $@
 .else
-LINKFLAGS+=	-x
+LINKFLAGS+=	-S
 .endif

 %LOAD
@ -152,10 +151,10 @@ SRCS=	${MAC68K}/mac68k/locore.s \
 	param.c ioconf.c ${CFILES} ${SFILES}
 depend:: .depend
 .depend: ${SRCS} assym.h param.c
-	mkdep ${AFLAGS} ${CPPFLAGS} ${MAC68K}/mac68k/locore.s
-	mkdep -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
-	mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
-	mkdep -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${MAC68K}/mac68k/genassym.c
+	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${MAC68K}/mac68k/locore.s
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
+	${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${MAC68K}/mac68k/genassym.c


 # depend on root or device configuration
--- a/sys/arch/mvme68k/conf/Makefile.mvme68k
+++ b/sys/arch/mvme68k/conf/Makefile.mvme68k
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.mvme68k,v 1.11 1996/05/11 16:12:27 mycroft Exp $
+#	$NetBSD: Makefile.mvme68k,v 1.12 1996/08/10 05:29:43 mycroft Exp $

 # Makefile for NetBSD
 #
@ -21,20 +21,20 @@
 # DEBUG is set to -g if debugging.
 # PROF is set to -pg if profiling.

-AS?=	as
 CC?=	cc
-CPP?=	cpp
 LD?=	ld
+MKDEP?=	mkdep
 STRIP?=	strip -d
 TOUCH?=	touch -f -c

 # source tree is located via $S relative to the compilation directory
-S=	../../../..
-MVME68K=../..
+S!=	cd ../../../..; pwd
+MVME68K=$S/arch/mvme68k

 INCLUDES=	-I. -I$S/arch -I$S
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -Dmc68020 -Dmvme68k -DFPCOPROC
-CFLAGS=		${DEBUG} -O2 -Werror -msoft-float
+CWARNFLAGS=	-Werror
+CFLAGS=		${DEBUG} ${CWARNFLAGS} -O2 -msoft-float
 AFLAGS=		-x assembler-with-cpp -traditional-cpp -D_LOCORE
 LINKFLAGS=	-n -Ttext 8000 -e start

@ -97,7 +97,7 @@ SYSTEM_LD_TAIL+=; \
 		echo cp $@ $@.gdb; rm -f $@.gdb; cp $@ $@.gdb; \
 		echo ${STRIP} $@; ${STRIP} $@
 .else
-LINKFLAGS+=	-x
+LINKFLAGS+=	-S
 .endif

 %LOAD
@ -151,10 +151,10 @@ SRCS=	${MVME68K}/mvme68k/locore.s \
 	param.c ioconf.c ${CFILES} ${SFILES}
 depend:: .depend
 .depend: ${SRCS} assym.h param.c
-	mkdep ${AFLAGS} ${CPPFLAGS} ${MVME68K}/mvme68k/locore.s
-	mkdep -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
-	mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
-	mkdep -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${MVME68K}/mvme68k/genassym.c
+	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${MVME68K}/mvme68k/locore.s
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
+	${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${MVME68K}/mvme68k/genassym.c


 # depend on root or device configuration
--- a/sys/arch/pc532/conf/Makefile.pc532
+++ b/sys/arch/pc532/conf/Makefile.pc532
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.pc532,v 1.26 1996/05/11 16:12:34 mycroft Exp $
+#	$NetBSD: Makefile.pc532,v 1.27 1996/08/10 05:29:44 mycroft Exp $

 # Makefile for NetBSD
 #
@ -21,22 +21,20 @@
 # DEBUG is set to -g if debugging.
 # PROF is set to -pg if profiling.

-AS?=	as
 CC?=	cc
-CPP?=	cpp
 LD?=	ld
+MKDEP?=	mkdep
 STRIP?=	strip -d
 TOUCH?=	touch -f -c

 # source tree is located via $S relative to the compilation directory
-S=	$(.CURDIR)/../../../..
-PC532=	$(.CURDIR)/../..
-KERNREL=
-COMPATREL=
+S!=	cd ../../../..; pwd
+PC532=	$S/arch/pc532

-INCLUDES=	-I$(.CURDIR) -I$S/arch -I$S
+INCLUDES=	-I. -I$S/arch -I$S
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL
-CFLAGS=		${DEBUG} -O2 -Werror -msb
+CWARNFLAGS=	-Werror
+CFLAGS=		${DEBUG} ${CWARNFLAGS} -O2 -msb
 AFLAGS=		-x assembler-with-cpp -traditional-cpp -D_LOCORE
 LINKFLAGS=	-z -Ttext FE002000 -e start

@ -96,7 +94,7 @@ SYSTEM_LD_TAIL+=; \
 		echo cp $@ $@.gdb; rm -f $@.gdb; cp $@ $@.gdb; \
 		echo ${STRIP} $@; ${STRIP} $@
 .else
-LINKFLAGS+=	-x
+LINKFLAGS+=	-S
 .endif

 %LOAD
@ -150,10 +148,10 @@ SRCS=	${PC532}/pc532/locore.s \
 	param.c ioconf.c ${CFILES} ${SFILES}
 depend:: .depend
 .depend: ${SRCS} assym.h param.c
-	mkdep ${AFLAGS} ${CPPFLAGS} ${PC532}/pc532/locore.s
-	mkdep -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
-	mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
-	mkdep -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${PC532}/pc532/genassym.c
+	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${PC532}/pc532/locore.s
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
+	${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${PC532}/pc532/genassym.c


 # depend on root or device configuration
--- a/sys/arch/pica/conf/Makefile.pica
+++ b/sys/arch/pica/conf/Makefile.pica
@ -1,17 +1,15 @@
-#	$NetBSD: Makefile.pica,v 1.4 1996/05/11 16:12:42 mycroft Exp $
+#	$NetBSD: Makefile.pica,v 1.5 1996/08/10 05:29:46 mycroft Exp $

-#	@(#)Makefile.pica	8.2 (Berkeley) 2/16/94
-#
 # Makefile for NetBSD
 #
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
-#	/sys/arch/MACHINE/conf/``machineid''
+#	/sys/arch/pica/conf/``machineid''
 # after which you should do
-#	 config machineid
+#	config machineid
 # Machine generic makefile changes should be made in
-#	/sys/arch/MACHINE/conf/Makefile.``machinetype''
+#	/sys/arch/pica/conf/Makefile.pmax
 # after which config should be rerun for all machines of that type.
 #
 # N.B.: NO DEPENDENCIES ON FOLLOWING FLAGS ARE VISIBLE TO MAKEFILE
@ -20,32 +18,25 @@
 # -DTRACE	compile in kernel tracing hooks
 # -DQUOTA	compile in file system quotas

+# DEBUG is set to -g if debugging.
+# PROF is set to -pg if profiling.

-# DEBUG is set to -g by config if debugging is requested (config -g).
-# PROF is set to -pg by config if profiling is requested (config -p).
-
-AS?=	as
 CC?=	cc
-CPP?=	cpp
-#LD?=ld.kern
 LD?=	ld
+MKDEP?=	mkdep
 STRIP?=	strip -d
 TOUCH?=	touch -f -c

 # source tree is located via $S relative to the compilation directory
-S=	../../../..
-PICA=	../..
+S!=	cd ../../../..; pwd
+PICA=	$S/arch/pica

-
-INCLUDES=	-I. -I$S/arch -I$S #-I$S/sys
+INCLUDES=	-I. -I$S/arch -I$S
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -Dpica -D__NetBSD__ ${GP}
-CFLAGS=		${DEBUG} -mips2 -mcpu=r4000	-O2 -Werror #-O2 -Werror 
-COPTS=		${CPPFLAGS} ${CFLAGS}
+CWARNFLAGS=	-Werror
+CFLAGS=		${DEBUG} ${CWARNFLAGS} -O2 -mips2 -mcpu=r4000
 AFLAGS=		-x assembler-with-cpp -traditional-cpp -D_LOCORE
-
-# XXX what should this be for pica?
-#LINKFLAGS=	-N -Ttext 80030000 -e start
-
+LINKFLAGS=	-N -Ttext 80080000 -e start

 ### find out what to use for libkern
 .include "$S/lib/libkern/Makefile.inc"
@ -68,98 +59,88 @@ LIBCOMPAT=	${COMPATLIB_PROF}
 # capitalized (e.g. C for a .c file), and CONFIG_DEP is _C if the file
 # is marked as config-dependent.

-
 NORMAL_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
 NORMAL_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<

 DRIVER_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
 DRIVER_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<

-NORMAL_S=	${AS} ${AFLAGS} ${CPPFLAGS}  $< -o $@
-NORMAL_S_C=	${AS} ${AFLAGS} $$CPPFLAGS} ${PARAM} $< -o $@
+NORMAL_S=	${CC} ${AFLAGS} ${CPPFLAGS} -c $<
+NORMAL_S_C=	${CC} ${AFLAGS} ${CPPFLAGS} ${PARAM} -c $<

 %OBJS

 %CFILES

+%SFILES
+
 # load lines for config "xxx" will be emitted as:
 # xxx: ${SYSTEM_DEP} swapxxx.o
 #	${SYSTEM_LD_HEAD}
 #	${SYSTEM_LD} swapxxx.o
 #	${SYSTEM_LD_TAIL}
-SYSTEM_OBJ=	locore.o fp.o ${OBJS} param.o ioconf.o ${LIBKERN} \
-		${LIBCOMPAT}
-#SYSTEM_DEP=	Makefile symbols.sort ${SYSTEM_OBJ} ${LIBKERN}
+SYSTEM_OBJ=	locore.o fp.o \
+		param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT}
 SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
-SYSTEM_LD_HEAD=	rm -f $@
-SYSTEM_LD=	-@if [ X${DEBUG} = X-g ]; \
-		then strip=-X; \
-		else strip=-x; \
-		fi; \
-		echo ${LD} $$strip -N -o $@ -e start -Ttext 80080000 \
-			'$${SYSTEM_OBJ}' vers.o; \
-		${LD} $$strip -N -o $@ -e start -Ttext 80080000 \
-			${SYSTEM_OBJ} vers.o
-#SYSTEM_LD_TAIL= @echo rearranging symbols;\
-#		symorder symbols.sort $@;\
-#SYSTEM_LD_TAIL=	@size $@; chmod 755 $@; \
-#		[ X${DEBUG} = X-g ] && { \
-#		echo cp $@ $@.gdb; rm -f $@.gdb; cp $@ $@.gdb; \
-#		echo strip -d $@; strip -d $@; } || true
-SYSTEM_LD_TAIL=	mv $@ ${@}.elf; \
-		elf2aout ${@}.elf $@; \
+SYSTEM_LD_HEAD=	@rm -f $@
+SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o ; \
+		${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
+SYSTEM_LD_TAIL=	@size $@; chmod 755 $@
+
+DEBUG?=
+.if ${DEBUG} == "-g"
+LINKFLAGS+=	-X
+SYSTEM_LD_TAIL+=; \
+		echo cp $@ $@.gdb; rm -f $@.gdb; cp $@ $@.gdb; \
+		echo ${STRIP} $@; ${STRIP} $@
+.else
+LINKFLAGS+=	-S
+.endif
+
+SYSTEM_LD_TAIL+=;\
+		mv $@ $@.elf; \
+		elf2aout $@.elf $@; \
 		chmod 755 $@; \
-		elf2ecoff ${@}.elf ${@}.ecoff
+		elf2ecoff $@.elf $@.ecoff

 %LOAD

 assym.h: genassym
 	./genassym >assym.h

-genassym: ${PICA}/pica/genassym.c
-	${CC} ${INCLUDES} ${IDENT} ${PARAM} -o genassym ${PICA}/pica/genassym.c
+genassym: genassym.o
+	${CC} -o $@ genassym.o

-newvers:
+genassym.o: ${PICA}/pica/genassym.c
+	${NORMAL_C_C}
+
+param.c: $S/conf/param.c
+	rm -f param.c
+	cp $S/conf/param.c .
+
+param.o: param.c Makefile
+	${NORMAL_C_C}
+
+ioconf.o: ioconf.c
+	${NORMAL_C}
+
+newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
 	sh $S/conf/newvers.sh
-	${CC} $(CFLAGS) -c vers.c
+	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
+

 clean::
-	rm -f eddep bsd bsd.gdb tags *.o locore.i [a-z]*.s \
-	    vnode_if.[ch] Errs errs linterrs makelinks genassym
+	rm -f eddep *netbsd netbsd.gdb tags *.[io] [a-z]*.s \
+	    [Ee]rrs linterrs makelinks genassym genassym.o assym.h

-lint: /tmp param.c
-	@lint -hbxn -DGENERIC -Dvolatile= ${COPTS} ${PARAM} -UKGDB \
+lint:
+	@lint -hbxncez -DGENERIC -Dvolatile= ${CPPFLAGS} ${PARAM} -UKGDB \
 	    ${PICA}/pica/Locore.c ${CFILES} ${PICA}/pica/swapgeneric.c \
-	    ioconf.c param.c
+	    ioconf.c param.c | \
+	    grep -v 'static function .* unused'

-symbols.sort: ${PICA}/pica/symbols.raw
-	grep -v '^#' ${PICA}/pica/symbols.raw \
-	    | sed 's/^	//' | sort -u > symbols.sort
-
-locore.o: ${PICA}/pica/locore.S ${PICA}/include/machAsmDefs.h \
-	${PICA}/include/machConst.h ${PICA}/include/reg.h assym.h
-	${CC} -c ${COPTS} ${PARAM} -DLOCORE -mips3 ${PICA}/pica/locore.S
-
-fp.o: ${PICA}/pica/fp.S ${PICA}/include/machAsmDefs.h \
-	${PICA}/include/machConst.h ${PICA}/include/reg.h assym.h
-	${CC} -c ${COPTS} ${PARAM} -DLOCORE ${PICA}/pica/fp.S
-
-# the following is necessary because autoconf.o depends on #if GENERIC
-autoconf.o: Makefile
-
-# the following are necessary because the files depend on the types of
-# cpu's included in the system configuration
-clock.o machdep.o autoconf.o conf.o: Makefile
-
-# depend on network configuration
-uipc_proto.o vfs_conf.o: Makefile
-
-depend:: .depend
-.depend: ${SRCS} assym.h param.c
-	mkdep ${AFLAGS} ${CPPFLAGS} ${PMAX}/pmax/locore.S ${PMAX}/pica/fp.S
-	mkdep -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
-	mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
-	mkdep -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${PMAX}/pmax/genassym.c
+tags:
+	@echo "see $S/kern/Makefile for tags"

 links:
 	egrep '#if' ${CFILES} | sed -f $S/conf/defines | \
@ -169,29 +150,34 @@ links:
 	  sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks
 	sh makelinks && rm -f dontlink

-tags:
-	@echo "see $S/kern/Makefile for tags"
+SRCS=	${PICA}/pica/locore.S ${PICA}/pica/fp.S \
+	param.c ioconf.c ${CFILES} ${SFILES}
+depend:: .depend
+.depend: ${SRCS} assym.h param.c
+	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${PMAX}/pmax/locore.S ${PMAX}/pica/fp.S
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
+	${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${PMAX}/pmax/genassym.c

-ioconf.o: ioconf.c
-	${NORMAL_C}

-param.c: $S/conf/param.c
-	rm -f param.c
-	cp $S/conf/param.c .
+# depend on root or device configuration
+autoconf.o conf.o: Makefile

-param.o: param.c Makefile
-	${NORMAL_C_C}
+# depend on network or filesystem configuration
+uipc_proto.o vfs_conf.o: Makefile

-vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
-	sh $S/conf/newvers.sh
-	${CC} ${CFLAGS} -c vers.c
+# depend on maxusers
+genassym.o machdep.o: Makefile

-#vnode_if.c: $S/kern/vnode_if.sh $S/kern/vnode_if.src
-#	sh $S/kern/vnode_if.sh $S/kern/vnode_if.src
-#vnode_if.h: $S/kern/vnode_if.sh $S/kern/vnode_if.src
-#	sh $S/kern/vnode_if.sh $S/kern/vnode_if.src
+# depend on CPU configuration
+machdep.o clock.o: Makefile
+
+
+
+locore.o: ${PICA}/pica/locore.S assym.h
+	${NORMAL_S}
+
+fp.o: ${PICA}/pica/fp.S assym.h
+	${NORMAL_S}

 %RULES
-
-
-
--- a/sys/arch/pmax/conf/Makefile.pmax
+++ b/sys/arch/pmax/conf/Makefile.pmax
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.pmax,v 1.29 1996/05/19 22:44:12 mhitch Exp $
+#	$NetBSD: Makefile.pmax,v 1.30 1996/08/10 05:29:48 mycroft Exp $

 # Makefile for NetBSD
 #
@ -21,20 +21,20 @@
 # DEBUG is set to -g if debugging.
 # PROF is set to -pg if profiling.

-AS?=	as
 CC?=	cc
-CPP?=	cpp
 LD?=	ld
+MKDEP?=	mkdep
 STRIP?=	strip -d
 TOUCH?=	touch -f -c

 # source tree is located via $S relative to the compilation directory
-S=	../../../..
-PMAX=	../..
+S!=	cd ../../../..; pwd
+PMAX=	$S/arch/pmax

 INCLUDES=	-I. -I$S/arch -I$S
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -Dpmax ${GP}
-CFLAGS=		${DEBUG} -O2 -Werror
+CWARNFLAGS=	-Werror
+CFLAGS=		${DEBUG} ${CWARNFLAGS} -O2
 AFLAGS=		-x assembler-with-cpp -traditional-cpp -D_LOCORE
 LINKFLAGS=	-N -Ttext 80030000 -e start

@ -94,7 +94,7 @@ SYSTEM_LD_TAIL+=; \
 		echo cp $@ $@.gdb; rm -f $@.gdb; cp $@ $@.gdb; \
 		echo ${STRIP} $@; ${STRIP} $@
 .else
-LINKFLAGS+=	-x
+LINKFLAGS+=	-S
 .endif

 SYSTEM_LD_TAIL+=;\
@ -153,10 +153,10 @@ SRCS=	${PMAX}/pmax/locore.S ${PMAX}/pmax/fp.S \
 	param.c ioconf.c ${CFILES} ${SFILES}
 depend:: .depend
 .depend: ${SRCS} assym.h param.c
-	mkdep ${AFLAGS} ${CPPFLAGS} ${PMAX}/pmax/locore.S ${PMAX}/pmax/fp.S
-	mkdep -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
-	mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
-	mkdep -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${S}/arch/mips/mips/genassym.c
+	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${PMAX}/pmax/locore.S ${PMAX}/pmax/fp.S
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
+	${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${S}/arch/mips/mips/genassym.c


 # depend on root or device configuration
--- a/sys/arch/sparc/conf/Makefile.sparc
+++ b/sys/arch/sparc/conf/Makefile.sparc
@ -1,4 +1,4 @@
-# 	$NetBSD: Makefile.sparc,v 1.32 1996/05/19 20:58:51 pk Exp $
+# 	$NetBSD: Makefile.sparc,v 1.33 1996/08/10 05:29:50 mycroft Exp $

 # Makefile for NetBSD
 #
@ -21,21 +21,20 @@
 # DEBUG is set to -g if debugging.
 # PROF is set to -pg if profiling.

-AS?=	as
 CC?=	cc
-CPP?=	cpp
 LD?=	ld
+MKDEP?=	mkdep
 STRIP?=	strip -d
 TOUCH?=	touch -f -c

 # source tree is located via $S relative to the compilation directory
-S=	../../../..
-SPARC=	../..
+S!=	cd ../../../..; pwd
+SPARC=	$S/arch/sparc

 INCLUDES=	-I. -I$S/arch -I$S
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL
-GCCWFLAGS=-Werror -Wall -Wstrict-prototypes -Wmissing-prototypes
-CFLAGS=		${DEBUG} -O2 ${GCCWFLAGS}
+CWARNFLAGS=	-Werror -Wall -Wstrict-prototypes -Wmissing-prototypes
+CFLAGS=		${DEBUG} ${CWARNFLAGS} -O2 
 AFLAGS=		-x assembler-with-cpp -traditional-cpp -D_LOCORE
 LINKFLAGS=	-N -p -Ttext F8004000 -e start

@ -95,7 +94,7 @@ SYSTEM_LD_TAIL+=; \
 		echo cp $@ $@.gdb; rm -f $@.gdb; cp $@ $@.gdb; \
 		echo ${STRIP} $@; ${STRIP} $@
 .else
-LINKFLAGS+=	-x
+LINKFLAGS+=	-S
 .endif

 %LOAD
@ -149,10 +148,10 @@ SRCS=	${SPARC}/sparc/locore.s \
 	param.c ioconf.c ${CFILES} ${SFILES}
 depend:: .depend
 .depend: ${SRCS} assym.h param.c
-	mkdep ${AFLAGS} ${CPPFLAGS} ${SPARC}/sparc/locore.s
-	mkdep -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
-	mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
-	mkdep -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${SPARC}/sparc/genassym.c
+	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${SPARC}/sparc/locore.s
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
+	${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${SPARC}/sparc/genassym.c


 # depend on root or device configuration
--- a/sys/arch/sun3/conf/Makefile.sun3
+++ b/sys/arch/sun3/conf/Makefile.sun3
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.sun3,v 1.46 1996/06/20 03:47:27 gwr Exp $
+#	$NetBSD: Makefile.sun3,v 1.47 1996/08/10 05:29:53 mycroft Exp $

 # Makefile for NetBSD
 #
@ -21,40 +21,40 @@
 # DEBUG is set to -g if debugging.
 # PROF is set to -pg if profiling.

-AS?=	as
 CC?=	cc
-CPP?=	cpp
 LD?=	ld
 MKDEP?=	mkdep
 STRIP?=	strip -d
 TOUCH?=	touch -f -c

 # source tree is located via $S relative to the compilation directory
-S=	../../../..
-SUN3=	../..
+S!=	cd ../../../..; pwd
+SUN3=	$S/arch/sun3

 # Override CPP defaults entirely, so cross-compilation works.
-INCLUDES=	-nostdinc -I. -I$S/arch -I$S
-XDEFS= 		-undef -D__NetBSD__ -Dm68k -Dmc68000
-DEFINES=	-D_KERNEL -Dmc68020 -Dsun3
-CPPFLAGS=	${INCLUDES} ${XDEFS} ${DEFINES} ${IDENT}
-# Make it easy to override this on the command line...
-WFLAGS= 	-Werror # -Wall -Wstrict-prototypes -Wmissing-prototypes
-CFLAGS= 	${DEBUG} -O2 -msoft-float ${WFLAGS}
-APPFLAGS=	-P -traditional ${CPPFLAGS} -D_LOCORE
+INCLUDES=	-I. -I$S/arch -I$S
+XDEFS=		-undef -D__NetBSD__ -Dm68k -Dmc68000
+CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -Dmc68020 -Dsun3 ${XDEFS}
+CWARNFLAGS= 	-Werror # -Wall -Wstrict-prototypes -Wmissing-prototypes
+CFLAGS= 	${DEBUG} ${CWARNFLAGS} -O2 -msoft-float
+AFLAGS=		-x assembler-with-cpp -traditional-cpp -D_LOCORE
 LINKFLAGS=	-N -Ttext 0E004000 -e start

-# What to use for libkern: (see ../compile/libkern)
-# Note, this can be shared by all kernel configs.
+### find out what to use for libkern
+.include "$S/lib/libkern/Makefile.inc"
 .ifndef PROF
-LIBKERN=	../libkern/libkern.o
+LIBKERN=	${KERNLIB}
 .else
-LIBKERN=	../libkern/libkern.po
+LIBKERN=	${KERNLIB_PROF}
 .endif

-# What to use for libcompat:
-# Would like to share this too, but it's config dependent.
-LIBCOMPAT=	libcompat.a
+### find out what to use for libcompat
+.include "$S/compat/common/Makefile.inc"
+.ifndef PROF
+LIBCOMPAT=	${COMPATLIB}
+.else
+LIBCOMPAT=	${COMPATLIB_PROF}
+.endif

 # compile rules: rules are named ${TYPE}_${SUFFIX}${CONFIG_DEP}
 # where TYPE is NORMAL, DRIVER, or PROFILE}; SUFFIX is the file suffix,
@ -67,12 +67,8 @@ NORMAL_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
 DRIVER_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
 DRIVER_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<

-NORMAL_S=	${CPP} ${APPFLAGS} $< > $*.s ;\
-		${AS} -o $@ $*.s ; rm $*.s
-NORMAL_S_C=	${CPP} ${APPFLAGS} ${PARAM} $< > $*.s ;\
-		${AS} -o $@ $*.s ; rm $*.s
-
-# OBJS, CFILES, SFILES follow:
+NORMAL_S=	${CC} ${AFLAGS} ${CPPFLAGS} -c $<
+NORMAL_S_C=	${CC} ${AFLAGS} ${CPPFLAGS} ${PARAM} -c $<

 %OBJS

@ -80,8 +76,6 @@ NORMAL_S_C=	${CPP} ${APPFLAGS} ${PARAM} $< > $*.s ;\

 %SFILES

-# OBJS, CFILES, SFILES done.
-
 # load lines for config "xxx" will be emitted as:
 # xxx: ${SYSTEM_DEP} swapxxx.o
 #	${SYSTEM_LD_HEAD}
@ -105,20 +99,8 @@ SYSTEM_LD_TAIL+=; \
 LINKFLAGS+=	-S
 .endif

-# LOAD+
-
 %LOAD

-# LOAD-
-
-.include "../libcompat/Makefile.inc"
-
-${LIBKERN} : .NOTMAIN .FORCE
-	@echo "making sure libkern is up-to-date..."
-	@(cd ../libkern ; ${MAKE})
-
-.FORCE:
-
 assym.h: genassym
 	./genassym >assym.h

@ -166,12 +148,10 @@ links:

 SRCS=	${SUN3}/sun3/locore.s \
 	param.c ioconf.c ${CFILES} ${SFILES}
-
 depend:: .depend
-.depend: ${SRCS} assym.h param.c ${COMPAT_DEPENDS}
-	${MKDEP} ${CPPFLAGS} param.c ioconf.c ${CFILES}
-	${MKDEP} -a ${CPPFLAGS} ${PARAM} ${SUN3}/sun3/genassym.c
-	${MKDEP} -a ${CPPFLAGS} ${COMPAT_DEPENDS}
+.depend: ${SRCS} assym.h param.c
+	${MKDEP} ${AFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${SUN3}/sun3/genassym.c

 # XXX - see below
 #	${MKDEP} -a ${APPFLAGS} ${SUN3}/sun3/locore.s
@ -183,6 +163,7 @@ depend:: .depend
 locore.o: assym.h machine/trap.h m68k/trap.h
 copy.o:   assym.h $S/sys/errno.h

+
 # depend on root or device configuration
 autoconf.o conf.o: Makefile
 
@ -195,9 +176,8 @@ genassym.o machdep.o: Makefile
 # depend on CPU configuration 
 db_machdep.o dvma.o machdep.o pmap.o sun3_startup.o vm_machdep.o: Makefile

-locore.o: ${SUN3}/sun3/locore.s
+
+locore.o: ${SUN3}/sun3/locore.s assym.h
 	${NORMAL_S}

-# Rules follow
-
 %RULES
--- a/sys/arch/vax/conf/Makefile.vax
+++ b/sys/arch/vax/conf/Makefile.vax
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.vax,v 1.22 1996/07/01 21:07:28 ragge Exp $
+#	$NetBSD: Makefile.vax,v 1.23 1996/08/10 05:29:55 mycroft Exp $

 # Makefile for NetBSD
 #
@ -22,20 +22,20 @@
 # DEBUG is set to -g if debugging.
 # PROF is set to -pg if profiling.

-AS?=	as
 CC?=	cc
-CPP?=	cpp
 LD?=	ld
+MKDEP?=	mkdep
 STRIP?=	strip -d
 TOUCH?=	touch -f -c

 # source tree is located via $S relative to the compilation directory
-S=	../../../..
-VAX=	../..
+S!=	cd ../../../..; pwd
+VAX=	$S/arch/vax

 INCLUDES=	-I. -I$S/arch -I$S
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -D_VAX_INLINE_
-CFLAGS=		${DEBUG} -O2 -Werror
+CWARNFLAGS=	-Werror
+CFLAGS=		${DEBUG} ${CWARNFLAGS} -O2 
 AFLAGS=		-x assembler-with-cpp -traditional-cpp -D_LOCORE
 LINKFLAGS=	-Z -Ttext 80000000 -e _start

@ -95,7 +95,7 @@ SYSTEM_LD_TAIL+=; \
 		echo cp $@ $@.gdb; rm -f $@.gdb; cp $@ $@.gdb; \
 		echo ${STRIP} $@; ${STRIP} $@
 .else
-LINKFLAGS+=	-x
+LINKFLAGS+=	-S
 .endif

 %LOAD
@ -140,9 +140,9 @@ SRCS=	${VAX}/vax/intvec.s ${VAX}/vax/subr.s \
 	param.c ioconf.c ${CFILES} ${SFILES}
 depend:: .depend
 .depend: ${SRCS} param.c
-	mkdep ${AFLAGS} ${CPPFLAGS} ${VAX}/vax/intvec.s ${VAX}/vax/subr.s
-	mkdep -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
-	mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
+	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${VAX}/vax/intvec.s ${VAX}/vax/subr.s
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
+	${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}


 # depend on root or device configuration
--- a/sys/arch/x68k/conf/Makefile.x68k
+++ b/sys/arch/x68k/conf/Makefile.x68k
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.x68k,v 1.3 1996/05/19 12:29:20 oki Exp $
+#	$NetBSD: Makefile.x68k,v 1.4 1996/08/10 05:29:57 mycroft Exp $

 # Makefile for NetBSD
 #
@ -21,20 +21,20 @@
 # DEBUG is set to -g if debugging.
 # PROF is set to -pg if profiling.

-AS?=	as
 CC?=	cc
-CPP?=	cpp
 LD?=	ld
+MKDEP?=	mkdep
 STRIP?=	strip -d
 TOUCH?=	touch -f -c

 # source tree is located via $S relative to the compilation directory
-S=	../../../..
-X68K=	../..
+S!=	cd ../../../..; pwd
+X68K=	$S/arch/x68k

 INCLUDES=	-I. -I$S/arch -I$S
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL -Dmc68020 -Dx68k -DFPCOPROC
-CFLAGS=		${DEBUG} -O2 -Werror -msoft-float
+CWARNFLAGS=	-Werror
+CFLAGS=		${DEBUG} ${CWARNFLAGS} -O2 -msoft-float
 AFLAGS=		-x assembler-with-cpp -traditional-cpp -D_LOCORE
 LINKFLAGS=	-n -Ttext 0 -e start

@ -100,7 +100,7 @@ SYSTEM_LD_TAIL+=; \
 		echo cp $@ $@.gdb; rm -f $@.gdb; cp $@ $@.gdb; \
 		echo ${STRIP} $@; ${STRIP} $@
 .else
-LINKFLAGS+=	-x
+LINKFLAGS+=	-S
 .endif

 %LOAD
@ -154,12 +154,12 @@ SRCS=	${X68K}/x68k/locore.s \
 	param.c ioconf.c ${CFILES} ${SFILES}
 depend:: .depend
 .depend: ${SRCS} assym.h param.c
-	mkdep ${AFLAGS} ${CPPFLAGS} ${X68K}/x68k/locore.s
-	mkdep -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
+	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${X68K}/x68k/locore.s
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 	-if test -n "${SFILES}"; then \
-		mkdep -a ${AFLAGS} ${CPPFLAGS} ${SFILES}; \
+		${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}; \
 	fi
-	mkdep -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${X68K}/x68k/genassym.c
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} ${PARAM} ${X68K}/x68k/genassym.c


 # depend on root or device configuration