--- Net2/arch/i386/conf/makefile.i386	2018/04/24 18:04:01	1.1.1.1
+++ Net2/arch/i386/conf/makefile.i386	2018/04/24 18:05:07	1.1.1.2
@@ -31,6 +31,16 @@ COPTS=	${INCLUDES} ${IDENT} -DKERNEL -Di
 ASFLAGS=
 CFLAGS=	-O ${COPTS}
 
+NORMAL_C= ${CC} -c ${CFLAGS} ${PROF} $<
+NORMAL_C_C= ${CC} -c ${CFLAGS} ${PROF} ${PARAM} $<
+DRIVER_C= ${CC} -c ${CFLAGS} ${PROF} $<
+DRIVER_C_C= ${CC} -c ${CFLAGS} ${PROF} ${PARAM} $<
+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 ${SYSTEM_OBJS}
+SYSTEM_LD_TAIL= @echo rearranging symbols; symorder symbols.sort $@; size $@; chmod 755 $@
+
 %OBJS
 
 %CFILES
@@ -38,7 +48,7 @@ CFLAGS=	-O ${COPTS}
 %LOAD
 
 clean:
-	rm -f eddep *vmunix tags *.o locore.i [a-uw-z]*.s \
+	rm -f eddep *386bsd tags *.o locore.i [a-uw-z]*.s \
 		errs linterrs makelinks
 
 lint: /tmp param.c
@@ -70,7 +80,7 @@ assym.s machdep.o: Makefile
 trap.o cons.o: Makefile
 
 assym.s: $S/sys/param.h machine/pte.h $S/sys/buf.h \
-    $S/sys/vmmeter.h $S/sys/map.h \
+    $S/sys/vmmeter.h \
     $S/sys/proc.h $S/sys/msgbuf.h machine/vmparam.h
 
 assym.s: genassym
@@ -81,8 +91,8 @@ genassym:
 		 ${I386}/i386/genassym.c -o genassym
 
 depend: assym.s param.c
-	mkdep ${COPTS} ${CFILES} ioconf.c
-	mkdep -a -p ${INCLUDES} ${IDENT} ${PARAM} ${I386}/i386/genassym.c
+	sh /usr/bin/mkdep ${COPTS} ${CFILES} ioconf.c
+	sh /usr/bin/mkdep -a -p ${INCLUDES} ${IDENT} ${PARAM} ${I386}/i386/genassym.c
 
 links:
 	egrep '#if' ${CFILES} | sed -f $S/conf/defines | \
@@ -95,9 +105,13 @@ links:
 tags:
 	@echo "see $S/kern/Makefile for tags"
 
-ioconf.o: ioconf.c $S/sys/param.h machine/pte.h $S/sys/buf.h $S/sys/map.h \
+ioconf.o: ioconf.c $S/sys/param.h machine/pte.h $S/sys/buf.h \
     ${I386}/isa/isa_device.h ${I386}/isa/isa.h ${I386}/isa/icu.h
-	${CC} -traditional -c ${CFLAGS} ioconf.c
+	${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
+	${CC} -traditional -c ${CFLAGS} ${I386}/i386/conf.c
 
 param.c: $S/conf/param.c
 	-rm -f param.c