Sync with following changes:

>   Added files:
>     sys/i386/boot        Makefile.inc
>  Revision  Changes    Path
>  1.63      +3 -12     src/sys/i386/boot/biosboot/Makefile
>  1.8       +1 -17     src/sys/i386/boot/kzipboot/Makefile
>  1.16      +6 -15     src/sys/i386/boot/netboot/Makefile
>  1.10      +3 -14     src/sys/i386/boot/rawboot/Makefile

5 files changed, 32 insertions, 57 deletions

diff --git a/sys/pc98/boot/Makefile.inc b/sys/pc98/boot/Makefile.inc
new file mode 100644
index 0000000..ce48279
--- /dev/null
+++ b/sys/pc98/boot/Makefile.inc
@@ -0,0 +1,20 @@
+.if exists(${.CURDIR}/../../../../include)
+CFLAGS+=	-nostdinc -I${.CURDIR}/../../../../include
+MKDEP+=		-nostdinc -I${.CURDIR}/../../../../include
+.endif
+CFLAGS+=	-I${.CURDIR}/../../.. -I${.OBJDIR}
+MKDEP+=		-I${.CURDIR}/../../.. -I${.OBJDIR}
+CLEANFILES+=	machine
+
+.if defined(SRCS)
+${SRCS:M*.[sS]:R:S/$/.o/g} ${SRCS:M*.c:R:S/$/.o/g}: machine
+${SRCS:M*.cc:R:S/$/.o/g}   ${SRCS:M*.C:R:S/$/.o/g}: machine
+${SRCS:M*.cxx:R:S/$/.o/g}  ${SRCS:N*.h:R:S/$/.o/g}: machine
+.endif
+.if defined(OBJS)
+${OBJS}: machine
+.endif
+
+beforedepend: machine
+machine:
+	ln -s ${.CURDIR}/../../include ${.OBJDIR}/machine
diff --git a/sys/pc98/boot/biosboot/Makefile b/sys/pc98/boot/biosboot/Makefile
index 50c5b45..c286f0e 100644
--- a/sys/pc98/boot/biosboot/Makefile
+++ b/sys/pc98/boot/biosboot/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.15 1998/01/28 12:20:57 kato Exp $
+#	$Id: Makefile,v 1.16 1998/02/16 09:36:53 kato Exp $
 #
 
 PROG=	boot
@@ -12,10 +12,6 @@ CFLAGS=		-O2 -malign-functions=0 -malign-jumps=0 -malign-loops=0 \
 		-mno-486 \
 		-DPC98 -DBOOTWAIT=${BOOTWAIT} -DTIMEOUT=${TIMEOUT}
 CFLAGS+=	-DBOOTSEG=${BOOTSEG} -DBOOTSTACK=${BOOTSTACK}
-.if exists(${.CURDIR}/../../../../include)
-CFLAGS+=	-nostdinc -I${.CURDIR}/../../../../include
-.endif
-CFLAGS+=	-I${.CURDIR}/../../.. -I${.OBJDIR}
 CFLAGS+=	${CWARNFLAGS}
 
 # By default, if a serial port is going to be used as console, use COM1
@@ -49,7 +45,7 @@ CFLAGS+=	-DCOMCONSOLE=${BOOT_COMCONSOLE_PORT} \
 # SCSI and have BIOS drive number (sd_unit_number + BOOT_HD_BIAS).  E.g.,
 # BOOT_HD_BIAS=1 makes sd(0,a) correspond to 1:sd(0,a) instead of 0:sd(0,a).
 
-CLEANFILES+=	boot.nohdr boot.strip boot1 boot2 machine sizetest
+CLEANFILES+=	boot.nohdr boot.strip boot1 boot2 sizetest
 LDFLAGS+=	-N -T 0 -nostdlib
 #LINKS=		${BINDIR}/sdboot ${BINDIR}/wdboot\
 #		${BINDIR}/sdboot ${BINDIR}/fdboot\
@@ -91,12 +87,7 @@ boot2:		boot.nohdr
 		exit 2 ; \
 	fi
 
-pre-compile:
-.if !exists(${.OBJDIR}/machine)
-	ln -s ${.CURDIR}/../../include ${.OBJDIR}/machine
-.endif
-
-all:	pre-compile boot1 boot2
+all:		boot1 boot2
 
 install:
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}\
diff --git a/sys/pc98/boot/kzipboot/Makefile b/sys/pc98/boot/kzipboot/Makefile
index 07f7b49..4b704e0 100644
--- a/sys/pc98/boot/kzipboot/Makefile
+++ b/sys/pc98/boot/kzipboot/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 1997/02/22 09:43:15 peter Exp $
+# $Id: Makefile,v 1.4 1998/02/16 09:37:02 kato Exp $
 
 PROG= kztail.o kzhead.o
 BINMODE = 444	# target is a relocatable object
@@ -17,30 +17,14 @@ CSEG    = 0x8
 
 STRIP=	#  very important!! don't let kz*.o be stripped
 
-.if exists(${.CURDIR}/../../../../include)
-CFLAGS+= -nostdinc
-CFLAGS+= -I${.OBJDIR} -I${.CURDIR}/../../../
-CFLAGS+= -I${.CURDIR}/../../../../include
-.endif
-
 CFLAGS+= -DKADDR=$(KADDR) -DCSEG=$(CSEG)
 CFLAGS+= -DKZIP -DCOMCONSOLE=0x30 
 CFLAGS+= -DPC98
 
-CLEANFILES=machine
-
 kztail.o:  ${OBJS_KZTAIL}
 	$(LD) -r -x -o kztail.o $(OBJS_KZTAIL)
 
 kzhead.o:  ${OBJS_KZHEAD}
 	$(LD) -r -x -o kzhead.o $(OBJS_KZHEAD)
 
-pre-compile:
-.if !exists(${.OBJDIR}/machine)
-	ln -s ${.CURDIR}/../../include ${.OBJDIR}/machine
-.endif
-
-all:	pre-compile ${PROG}
-
-
 .include <bsd.prog.mk>
diff --git a/sys/pc98/boot/netboot/Makefile b/sys/pc98/boot/netboot/Makefile
index 63bdd12..86ece2d 100644
--- a/sys/pc98/boot/netboot/Makefile
+++ b/sys/pc98/boot/netboot/Makefile
@@ -37,7 +37,6 @@ SRCS=	start2.S main.c misc.c bootmenu.c rpc.c
 
 BINDIR=		/usr/mdec
 BINMODE=	555
-
 CFLAGS=		-O2 -DNFS -DROMSIZE=${ROMSIZE} -DRELOC=${RELOCADDR} -DASK_BOOT
 CFLAGS+=	-DPC98
 #CFLAGS += -DPCI -DPCI_VENDOR=${PCI_VENDOR} -DPCI_DEVICE=${PCI_DEVICE}
@@ -46,19 +45,13 @@ CFLAGS+=	-DPC98
 #NS8390=	-DINCLUDE_NE
 #NS8390+=	-DINCLUDE_3COM -D_3COM_BASE=0x300
 NS8390=	-DINCLUDE_EGY -DNE_BASE=0xd0
-CLEANFILES+=	machine netboot.com
+CLEANFILES+=	netboot.com
 CLEANFILES+=	makerom start2.ro 3c509.o ns8390.o
 LDFLAGS+=	-N -T ${RELOCADDR} -e _start -nostdlib
 NOSHARED=	YES
 NOMAN=
 STRIP=
 
-.if exists(${.CURDIR}/../../../../include)
-CFLAGS+= -nostdinc
-CFLAGS+= -I${.OBJDIR} -I${.CURDIR}/../../../
-CFLAGS+= -I${.CURDIR}/../../../../include
-.endif
-
 ROMSIZE=16384
 RELOCADDR=0x90000
 
@@ -99,11 +92,9 @@ nb3c509.com:	start2.o ${SRCS:N*.h:R:S/$/.o/g} 3c509.o
 	dd ibs=32 skip=1 if=${.TARGET}.tmp of=${.TARGET}
 	rm -f ${.TARGET}.tmp
 
-pre-compile:
-.if !exists(${.OBJDIR}/machine)
-	ln -s ${.CURDIR}/../../include ${.OBJDIR}/machine
-.endif
-
-all:	pre-compile ${PROG}
+# This force the creation of the "machine" symlink.  These objects are
+# specially handled in this file, and thus can't be taken care of in
+# ../Makefile.inc
+3c509.o makerom ns8390.o start2.ro:	beforedepend
 
 .include <bsd.prog.mk>
diff --git a/sys/pc98/boot/rawboot/Makefile b/sys/pc98/boot/rawboot/Makefile
index deea612..857ed1a 100644
--- a/sys/pc98/boot/rawboot/Makefile
+++ b/sys/pc98/boot/rawboot/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.7 1997/04/26 04:00:25 kato Exp $
+#	$Id: Makefile,v 1.8 1998/02/16 09:37:18 kato Exp $
 #
 
 PROG=	boot
@@ -35,12 +35,6 @@ CFLAGS+=	-DPROBE_KEYBOARD_LOCK
 CFLAGS+=	-DFORCE_COMCONSOLE
 .endif
 
-.if exists(${.CURDIR}/../../../../include)
-CFLAGS+= -nostdinc
-CFLAGS+= -I${.OBJDIR} -I${.CURDIR}/../../../
-CFLAGS+= -I${.CURDIR}/../../../../include
-.endif
-
 # By default, if a serial port is going to be used as console, use COM1
 # (aka /dev/ttyd0).
 BOOT_COMCONSOLE_PORT?=0x30
@@ -68,7 +62,7 @@ CFLAGS+=	-DCOMCONSOLE=${BOOT_COMCONSOLE_PORT} \
 # SCSI and have BIOS drive number (sd_unit_number + BOOT_HD_BIAS).  E.g.,
 # BOOT_HD_BIAS=1 makes sd(0,a) correspond to 1:sd(0,a) instead of 0:sd(0,a).
 
-CLEANFILES+=	boot.nohdr boot.strip machine rawboot sizetest
+CLEANFILES+=	boot.nohdr boot.strip rawboot sizetest
 LDFLAGS+=	-N -T 0 -nostdlib
 NOSHARED=	YES
 NOMAN=
@@ -97,12 +91,7 @@ boot.nohdr:	boot.strip
 rawboot:	boot.nohdr
 	dd if=boot.nohdr of=rawboot bs=8k count=1 conv=sync
 
-pre-compile:
-.if !exists(${.OBJDIR}/machine)
-	ln -s ${.CURDIR}/../../include ${.OBJDIR}/machine
-.endif
-
-all:		pre-compile rawboot
+all:		rawboot
 
 install:
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}\