--- Net2/arch/i386/conf/makefile.i386	2018/04/24 18:12:13	1.1.1.3
+++ Net2/arch/i386/conf/makefile.i386	2018/04/24 18:20:16	1.1.1.4
@@ -1,6 +1,8 @@
 # Copyright 1990 W. Jolitz
-# @(#)Makefile.i386	7.1 5/10/91
-# Makefile for 4.3 BSD-Reno
+# from @(#)Makefile.i386	7.1 5/10/91
+# Makefile.i386,v 1.25 1993/07/19 16:52:16 mycroft Exp
+#
+# Makefile for NetBSD
 #
 # This makefile is constructed from a machine description:
 #	config machineid
@@ -18,26 +20,18 @@
 # -DTRACE	compile in kernel tracing hooks
 # -DQUOTA	compile in file system quotas
 #
-# PATCHES MAGIC                LEVEL   PATCH THAT GOT US HERE
-# --------------------         -----   ----------------------
-# CURRENT PATCH LEVEL:         1       00001
-# --------------------         -----   ----------------------
-#
-# 29 Jun 92	Chris G. Demetriou	Fix vers.o for kernel profiling and
-#						plain old link
-#
 TOUCH=	touch -f -c
 LD=	/usr/bin/ld
 CC=	cc 
 CPP=	cpp
 
-S=	../..
-I386=	../../i386
+S=	../../../..
+I386=	../..
 
-INCLUDES= -I. -I$S -I$S/sys
-COPTS=	${INCLUDES} ${IDENT} -DKERNEL -Di386 -DNPX
+INCLUDES= -I. -I$S/arch -I$S -I$S/sys
+COPTS=	${INCLUDES} ${IDENT} -DKERNEL -Di386
 ASFLAGS=
-CFLAGS=	-O ${COPTS}
+CFLAGS=	-O ${DEBUG} ${COPTS}
 
 NORMAL_C= ${CC} -c ${CFLAGS} ${PROF} $<
 NORMAL_C_C= ${CC} -c ${CFLAGS} ${PROF} ${PARAM} $<
@@ -47,12 +41,15 @@ DRIVER_C_C= ${CC} -c ${CFLAGS} ${PROF} $
 SYSTEM_OBJS=locore.o ${OBJS} param.o ioconf.o conf.o
 SYSTEM_DEP=Makefile symbols.sort ${SYSTEM_OBJS}
 SYSTEM_LD_HEAD= 	@echo loading $@; rm -f $@
-SYSTEM_LD= @${LD} -z -T FE000000 -o $@ -X vers.o ${SYSTEM_OBJS}
-SYSTEM_LD_TAIL= @echo rearranging symbols; symorder symbols.sort $@; /usr/sbin/dbsym $@ || true; size $@; chmod 755 $@
+SYSTEM_LD= @${LD} -z -T ${LOAD_ADDRESS} -o $@ -X vers.o ${SYSTEM_OBJS}
+SYSTEM_LD_TAIL= @echo rearranging symbols; symorder symbols.sort $@; /usr/sbin/dbsym -fT ${LOAD_ADDRESS} $@; size $@; chmod 755 $@
 
-GPROF.EX=	/usr/src/lib/csu.i386/gprof.ex
+# (XXX) ok, this is weird.  but we've got a working ed, and a broken ex, and
+# the script is identical for either... -- cgd
+#
+GPROF.EX=	/usr/src/lib/csu/i386/gprof.ex
 PROFILE_C=	${CC} -S -c ${CFLAGS} $< ; \
-		ex - $*.s < ${GPROF.EX} ; \
+		ed - $*.s < ${GPROF.EX} ; \
 		${AS} -o $@ $*.s ; \
 		rm -f $*.s
 
@@ -63,8 +60,8 @@ PROFILE_C=	${CC} -S -c ${CFLAGS} $< ; \
 %LOAD
 
 clean:
-	rm -f eddep *386bsd tags *.o locore.i [a-uw-z]*.s \
-		errs linterrs makelinks
+	rm -f eddep *netbsd tags *.o locore.i [a-uw-z]*.s \
+		errs linterrs makelinks genassym
 
 lint: /tmp param.c
 	@lint -hbxn -I. -DGENERIC -Dvolatile= ${COPTS} ${PARAM} \
@@ -77,8 +74,9 @@ symbols.sort: ${I386}/i386/symbols.raw
 	    | sed 's/^	//' | sort -u > symbols.sort
 
 locore.o: assym.s ${I386}/i386/locore.s machine/trap.h machine/psl.h \
-	machine/pte.h vector.s ${I386}/isa/icu.s ${I386}/isa/isa.h \
-	${I386}/isa/icu.h
+	machine/pte.h ${I386}/isa/vector.s ${I386}/isa/icu.s \
+	$S/sys/errno.h machine/specialreg.h ${I386}/isa/debug.h \
+	${I386}/isa/icu.h ${I386}/isa/isa.h vector.h $S/net/netisr.h
 	${CPP} -I. -DLOCORE ${COPTS} ${I386}/i386/locore.s | \
 		${AS} ${ASFLAGS} -o locore.o
 
@@ -106,7 +104,7 @@ genassym:
 		 ${I386}/i386/genassym.c -o genassym
 
 depend: assym.s param.c
-	sh /usr/bin/mkdep ${COPTS} ${CFILES} ioconf.c
+	sh /usr/bin/mkdep ${COPTS} ${CFILES} ioconf.c param.c ${I386}/i386/conf.c
 	sh /usr/bin/mkdep -a -p ${INCLUDES} ${IDENT} ${PARAM} ${I386}/i386/genassym.c
 
 links:
@@ -124,8 +122,7 @@ ioconf.o: ioconf.c $S/sys/param.h machin
     ${I386}/isa/isa_device.h ${I386}/isa/isa.h ${I386}/isa/icu.h
 	${CC} -c ${CFLAGS} ioconf.c
 
-conf.o: $S/sys/param.h $S/sys/systm.h $S/sys/buf.h $S/sys/ioctl.h \
-	$S/sys/tty.h $S/sys/conf.h ${I386}/i386/conf.c
+conf.o: ${I386}/i386/conf.c
 	${CC} -traditional -c ${CFLAGS} ${I386}/i386/conf.c
 
 param.c: $S/conf/param.c
@@ -135,9 +132,9 @@ param.c: $S/conf/param.c
 param.o: param.c Makefile
 	${CC} -c ${CFLAGS} ${PARAM} param.c
 
-newvers:
+vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
 	sh $S/conf/newvers.sh ${KERN_IDENT} ${IDENT}
-	cc ${CFLAGS} -c vers.c
+	${CC} ${CFLAGS} -c vers.c
 
 %RULES