Remove machdep.c from files.i386 and put machdep.o in the SYSTEM_OBJS

line of Makefile.i386.  Fixes the extra rule that gmake complains about
for machdep.o.  This fix is from Joans 0lsson.

Rework the depends and rules for assym.s and genassym so that we now use
the .depend rule for genassym.o such that if you change any header files
that are included by genassym.c the right things happen.  This is probably
what has caused more bad kernel builds than any other thing in the
Makefile.i386!

3 files changed, 15 insertions, 24 deletions

diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 5b04970..5d66a8e 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.6 1993/10/06 20:49:17 rgrimes Exp $
+#	$Id: Makefile.i386,v 1.7 1993/10/08 16:52:44 rgrimes Exp $
 #
 # Makefile for FreeBSD
 #
@@ -41,7 +41,7 @@ NORMAL_C_C= ${CC} -c ${CFLAGS} ${PROF} ${PARAM} $<
 NORMAL_S= ${CPP} -I. -DLOCORE ${COPTS} $< | ${AS} ${ASFLAGS} -o $*.o
 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_OBJS=locore.o ${OBJS} param.o ioconf.o conf.o machdep.o
 SYSTEM_DEP=Makefile symbols.sort ${SYSTEM_OBJS}
 SYSTEM_LD_HEAD= 	@echo loading $@; rm -f $@
 SYSTEM_LD= @${LD} -z -T ${LOAD_ADDRESS} -o $@ -X vers.o ${SYSTEM_OBJS}
@@ -65,7 +65,7 @@ PROFILE_C=	${CC} -S -c ${CFLAGS} $< ; \
 
 clean:
 	rm -f eddep *386bsd tags *.o locore.i [a-uw-z]*.s \
-		errs linterrs makelinks genassym
+		errs linterrs makelinks
 
 lint: /tmp param.c
 	@lint -hbxn -I. -DGENERIC -Dvolatile= ${COPTS} ${PARAM} \
@@ -99,16 +99,12 @@ assym.s: Makefile
 # depends on KDB (cons.o also depends on GENERIC)
 trap.o cons.o: Makefile
 
-assym.s: $S/sys/param.h machine/pte.h $S/sys/buf.h \
-    $S/sys/vmmeter.h \
-    $S/sys/proc.h $S/sys/msgbuf.h machine/vmparam.h
+assym.s: genassym.o
+	./genassym.o >assym.s
 
-assym.s: genassym
-	./genassym >assym.s
-
-genassym: ${I386}/i386/genassym.c
+genassym.o:
 	${CC} ${INCLUDES} -DKERNEL ${IDENT} ${PARAM} \
-		 ${I386}/i386/genassym.c -o genassym
+		 ${I386}/i386/genassym.c -o genassym.o
 
 depend: assym.s param.c
 	sh /usr/bin/mkdep -DLOAD_ADDRESS=0x${LOAD_ADDRESS} ${COPTS} ${CFILES} ioconf.c param.c ${I386}/i386/conf.c
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index 5b04970..5d66a8e 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.6 1993/10/06 20:49:17 rgrimes Exp $
+#	$Id: Makefile.i386,v 1.7 1993/10/08 16:52:44 rgrimes Exp $
 #
 # Makefile for FreeBSD
 #
@@ -41,7 +41,7 @@ NORMAL_C_C= ${CC} -c ${CFLAGS} ${PROF} ${PARAM} $<
 NORMAL_S= ${CPP} -I. -DLOCORE ${COPTS} $< | ${AS} ${ASFLAGS} -o $*.o
 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_OBJS=locore.o ${OBJS} param.o ioconf.o conf.o machdep.o
 SYSTEM_DEP=Makefile symbols.sort ${SYSTEM_OBJS}
 SYSTEM_LD_HEAD= 	@echo loading $@; rm -f $@
 SYSTEM_LD= @${LD} -z -T ${LOAD_ADDRESS} -o $@ -X vers.o ${SYSTEM_OBJS}
@@ -65,7 +65,7 @@ PROFILE_C=	${CC} -S -c ${CFLAGS} $< ; \
 
 clean:
 	rm -f eddep *386bsd tags *.o locore.i [a-uw-z]*.s \
-		errs linterrs makelinks genassym
+		errs linterrs makelinks
 
 lint: /tmp param.c
 	@lint -hbxn -I. -DGENERIC -Dvolatile= ${COPTS} ${PARAM} \
@@ -99,16 +99,12 @@ assym.s: Makefile
 # depends on KDB (cons.o also depends on GENERIC)
 trap.o cons.o: Makefile
 
-assym.s: $S/sys/param.h machine/pte.h $S/sys/buf.h \
-    $S/sys/vmmeter.h \
-    $S/sys/proc.h $S/sys/msgbuf.h machine/vmparam.h
+assym.s: genassym.o
+	./genassym.o >assym.s
 
-assym.s: genassym
-	./genassym >assym.s
-
-genassym: ${I386}/i386/genassym.c
+genassym.o:
 	${CC} ${INCLUDES} -DKERNEL ${IDENT} ${PARAM} \
-		 ${I386}/i386/genassym.c -o genassym
+		 ${I386}/i386/genassym.c -o genassym.o
 
 depend: assym.s param.c
 	sh /usr/bin/mkdep -DLOAD_ADDRESS=0x${LOAD_ADDRESS} ${COPTS} ${CFILES} ioconf.c param.c ${I386}/i386/conf.c
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 93e073b..277d3bb 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.i386,v 1.14 1993/10/10 16:25:13 rgrimes Exp $
+#	$Id: files.i386,v 1.15 1993/10/11 06:19:40 rgrimes Exp $
 #
 i386/i386/autoconf.c		standard		device-driver
 i386/i386/cons.c		standard
@@ -9,7 +9,6 @@ i386/i386/db_disasm.c		optional	ddb
 i386/i386/db_interface.c	optional	ddb
 i386/i386/db_trace.c		optional	ddb
 i386/i386/in_cksum.c		optional	inet
-i386/i386/machdep.c		standard		config-dependent
 i386/i386/math_emulate.c	optional	math_emulate
 i386/i386/mem.c			standard
 i386/i386/microtime.s		standard