Sync with sys/i386/conf/Makefile.i386 revision 1.117.

1 files changed, 30 insertions, 40 deletions

diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98
index fa66a05..fe21166 100644
--- a/sys/conf/Makefile.pc98
+++ b/sys/conf/Makefile.pc98
@@ -3,7 +3,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.pc98,v 1.32 1998/06/17 16:30:53 kato Exp $
+#	$Id: Makefile.pc98,v 1.33 1998/06/25 10:49:49 kato Exp $
 #
 # Makefile for FreeBSD
 #
@@ -19,7 +19,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	300004
+%VERSREQ=	300005
 
 BINFORMAT?=	aout
 #BINFORMAT?=	aoutkld
@@ -56,13 +56,13 @@ PROF+=	-mprofiler-epilogue
 .endif
 
 NORMAL_C= ${CC} -c ${CFLAGS} ${PROF} $<
-NORMAL_C_C= ${CC} -c ${CFLAGS} ${PROF} ${PARAM} $<
+NORMAL_C_C= ${CC} -c ${CFLAGS} ${PROF} $<
 # XXX LOCORE means "don't declare C stuff" not "for locore.s".
 NORMAL_S= ${CC} -c -x assembler-with-cpp -DLOCORE ${COPTS} $<
 DRIVER_C= ${CC} -c ${CFLAGS} ${PROF} $<
-DRIVER_C_C= ${CC} -c ${CFLAGS} ${PROF} ${PARAM} $<
+DRIVER_C_C= ${CC} -c ${CFLAGS} ${PROF} $<
 DRIVER_S= ${CC} -c -x assembler-with-cpp -DLOCORE ${COPTS} $<
-PROFILE_C= ${CC} -c ${CFLAGS} ${PARAM} $<
+PROFILE_C= ${CC} -c ${CFLAGS} $<
 
 # ${I386}/i386/setdef0.c and ${I386}/i386/setdef1.c are intentionally
 # omitted from SYSTEM_CFILES.  They depend on setdefs.h, a header which
@@ -112,15 +112,15 @@ SYSTEM_LD_TAIL= @size ${.TARGET} ; chmod 755 ${.TARGET}
 clean:
 	rm -f *.o *.s eddep errs genassym gensetdefs kernel linterrs \
 	      makelinks param.c setdefs.h symbols.exclude symbols.sort tags \
-	      vers.c vnode_if.c vnode_if.h .vnode_if_created ${CLEAN}
+	      vers.c vnode_if.c vnode_if.h ${CLEAN}
 
 #lint: /tmp param.c
-#	@lint -hbxn -DGENERIC -Dvolatile= ${COPTS} ${PARAM} \
+#	@lint -hbxn -DGENERIC -Dvolatile= ${COPTS} \
 #	  ${I386}/i386/Locore.c ${CFILES} ioconf.c param.c | \
 #	    grep -v 'struct/union .* never defined' | \
 #	    grep -v 'possible pointer alignment problem'
 
-symbols.exclude: Makefile
+symbols.exclude:
 	echo "gcc2_compiled." >symbols.exclude
 	echo "___gnu_compiled_c" >>symbols.exclude
 
@@ -146,42 +146,26 @@ gensetdefs: gensetdefs.o
 gensetdefs.o: ${I386}/i386/gensetdefs.c
 	${CC} -c ${CFLAGS} ${I386}/i386/gensetdefs.c
 
-# everything potentially depends on the Makefile since everything potentially
-# depends on the options.  Some things are more dependent on the Makefile for
-# historical reasons.
-machdep.o: Makefile
-
-# the following is necessary because autoconf.o depends on #if GENERIC
-autoconf.o: Makefile
-
-# XXX - may no longer be needed
-locore.o: Makefile
-
-# depends on KDB (cons.o also depends on GENERIC)
-trap.o cons.o: Makefile
-
 # this rule stops ./assym.s in .depend from causing problems
 ./assym.s: assym.s
 
 assym.s: genassym
 	./genassym >assym.s
 
-# Some of the defines that genassym outputs may well depend on the
-# value of kernel options.
-genassym.o: ${I386}/i386/genassym.c Makefile opt_global.h opt_vm86.h
+genassym.o: ${I386}/i386/genassym.c
 	rm -f ./machine ; ln -s ${I386}/include ./machine
-	${CC} -c ${CFLAGS} ${PARAM} -UKERNEL ${I386}/i386/genassym.c
+	${CC} -c ${CFLAGS} -UKERNEL ${I386}/i386/genassym.c
 
 genassym: genassym.o
-	${CC} ${CFLAGS} ${PARAM} genassym.o -o ${.TARGET}
+	${CC} ${CFLAGS} genassym.o -o ${.TARGET}
 
-${OBJS}: opt_global.h
+${SYSTEM_OBJS}: opt_global.h
 
 # XXX this assumes that the options for NORMAL_C* and DRIVER_C* are identical.
 depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND}
 	rm -f .newdep
 	mkdep -a -f .newdep ${COPTS} ${CFILES} ${SYSTEM_CFILES}
-	mkdep -a -f .newdep ${COPTS} ${PARAM} -UKERNEL ${I386}/i386/genassym.c
+	mkdep -a -f .newdep ${COPTS} -UKERNEL ${I386}/i386/genassym.c
 	MKDEP_CPP="${CC} -E -x assembler-with-cpp" ; export MKDEP_CPP ; \
 	mkdep -a -f .newdep -DLOCORE ${COPTS} ${SFILES} ${SYSTEM_SFILES}
 	rm -f .depend
@@ -219,27 +203,33 @@ install:
 	fi
 	install -c -m 555 -o root -g wheel -fschg kernel ${DESTDIR}/
 
-ioconf.o: ioconf.c $S/sys/param.h $S/sys/buf.h \
-    ${I386}/isa/isa_device.h ${PC98}/pc98/pc98.h ${I386}/isa/icu.h
-	${CC} -c ${CFLAGS} ioconf.c
+config.o:
+	${NORMAL_C}
+
+ioconf.o:
+	${NORMAL_C}
 
 param.c: $S/conf/param.c
 	-rm -f param.c
 	cp $S/conf/param.c .
 
-param.o: param.c Makefile
-	${CC} -c ${CFLAGS} ${PARAM} param.c
+param.o:
+	${NORMAL_C}
 
-vers.o: $S/sys/param.h ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
+vers.c: $S/conf/newvers.sh $S/sys/param.h ${SYSTEM_DEP}
 	sh $S/conf/newvers.sh ${KERN_IDENT} ${IDENT}
-	${CC} ${CFLAGS} -c vers.c
 
-vnode_if.c vnode_if.h: .vnode_if_created
-	touch ${.TARGET}
+# XXX strictly, everything depends on Makefile because changes to ${PROF}
+# only appear there, but we don't handle that.
+vers.o:
+	${NORMAL_C}
 
-.vnode_if_created: $S/kern/vnode_if.sh $S/kern/vnode_if.src
+.ORDER: vnode_if.c vnode_if.h
+vnode_if.c vnode_if.h: $S/kern/vnode_if.sh $S/kern/vnode_if.src
 	sh $S/kern/vnode_if.sh $S/kern/vnode_if.src
-	touch ${.TARGET}
+
+vnode_if.o:
+	${NORMAL_C}
 
 .include <bsd.kern.mk>