diff options
author | eivind <eivind@FreeBSD.org> | 1998-02-15 21:38:19 +0000 |
---|---|---|
committer | eivind <eivind@FreeBSD.org> | 1998-02-15 21:38:19 +0000 |
commit | b5aaf93a530e1426fc8bdc33ece5317b2b551704 (patch) | |
tree | e9d99752a1e558c53d98142a7941e60189b921d5 /sys | |
parent | d38151f2d027babf495107be4bd6755e547fc85d (diff) | |
download | FreeBSD-src-b5aaf93a530e1426fc8bdc33ece5317b2b551704.zip FreeBSD-src-b5aaf93a530e1426fc8bdc33ece5317b2b551704.tar.gz |
Make bootblock building independent of /usr/include if relative
includes are available.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/i386/boot/biosboot/Makefile | 16 | ||||
-rw-r--r-- | sys/i386/boot/kzipboot/Makefile | 18 | ||||
-rw-r--r-- | sys/i386/boot/netboot/Makefile | 17 | ||||
-rw-r--r-- | sys/i386/boot/netboot/makerom.c | 2 | ||||
-rw-r--r-- | sys/i386/boot/rawboot/Makefile | 17 |
5 files changed, 59 insertions, 11 deletions
diff --git a/sys/i386/boot/biosboot/Makefile b/sys/i386/boot/biosboot/Makefile index 89395ed..4bd7705 100644 --- a/sys/i386/boot/biosboot/Makefile +++ b/sys/i386/boot/biosboot/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.60 1997/08/31 06:11:25 phk Exp $ +# $Id: Makefile,v 1.61 1998/01/27 16:56:43 msmith Exp $ # PROG= boot @@ -14,7 +14,10 @@ CFLAGS= -O2 -malign-functions=0 -malign-jumps=0 -malign-loops=0 \ CFLAGS+= -DBOOTSEG=${BOOTSEG} -DBOOTSTACK=${BOOTSTACK} CFLAGS+= -DDO_BAD144 CFLAGS+= -DVESA_SUPPORT -CFLAGS+= -I${.CURDIR}/../../.. +.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 @@ -43,7 +46,7 @@ CFLAGS+= -DCONSPEED=${BOOT_COMCONSOLE_SPEED} # 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 sizetest +CLEANFILES+= boot.nohdr boot.strip boot1 boot2 machine sizetest LDFLAGS+= -N -T 0 -nostdlib #LINKS= ${BINDIR}/sdboot ${BINDIR}/wdboot\ # ${BINDIR}/sdboot ${BINDIR}/fdboot\ @@ -85,7 +88,12 @@ boot2: boot.nohdr exit 2 ; \ fi -all: boot1 boot2 +pre-compile: +.if !exists(${.OBJDIR}/machine) + ln -s ${.CURDIR}/../../include ${.OBJDIR}/machine +.endif + +all: pre-compile boot1 boot2 install: ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}\ diff --git a/sys/i386/boot/kzipboot/Makefile b/sys/i386/boot/kzipboot/Makefile index bf3e194..939591d 100644 --- a/sys/i386/boot/kzipboot/Makefile +++ b/sys/i386/boot/kzipboot/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.6 1997/02/22 09:31:22 peter Exp $ PROG= kztail.o kzhead.o BINMODE = 444 # target is a relocatable object @@ -17,13 +17,29 @@ 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=0x3F8 +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/i386/boot/netboot/Makefile b/sys/i386/boot/netboot/Makefile index f1db99a..44725f0 100644 --- a/sys/i386/boot/netboot/Makefile +++ b/sys/i386/boot/netboot/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.14 1997/10/07 06:40:16 bde Exp $ # # Makefile for NETBOOT # @@ -31,6 +31,7 @@ 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= -O2 -DNFS -DROMSIZE=${ROMSIZE} -DRELOC=${RELOCADDR} # -DASK_BOOT CFLAGS += -DPCI -DPCI_VENDOR=${PCI_VENDOR} -DPCI_DEVICE=${PCI_DEVICE} @@ -38,13 +39,19 @@ CFLAGS += -DPCI_CLASS=${PCI_CLASS} -DASK_BOOT #NS8390= -DINCLUDE_WD -DWD_DEFAULT_MEM=0xD0000 NS8390= -DINCLUDE_NE #NS8390+= -DINCLUDE_3COM -D_3COM_BASE=0x300 -CLEANFILES+= netboot.com +CLEANFILES+= machine netboot.com CLEANFILES+= makerom start2.ro 3c509.o ns8390.o LDFLAGS+= -N -T ${RELOCADDR} -e _start -nostdlib NOSHARED= YES MAN8= netboot.8 STRIP= +.if exists(${.CURDIR}/../../../../include) +CFLAGS+= -nostdinc +CFLAGS+= -I${.OBJDIR} -I${.CURDIR}/../../../ +CFLAGS+= -I${.CURDIR}/../../../../include +.endif + ROMSIZE=16384 RELOCADDR=0x90000 @@ -85,5 +92,11 @@ 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} .include <bsd.prog.mk> diff --git a/sys/i386/boot/netboot/makerom.c b/sys/i386/boot/netboot/makerom.c index b5b1008..51b1c28 100644 --- a/sys/i386/boot/netboot/makerom.c +++ b/sys/i386/boot/netboot/makerom.c @@ -6,7 +6,7 @@ This program strips off the FreeBSD a.out header! ************************************************************************/ #include <stdio.h> -#include <fcntl.h> +#include <sys/fcntl.h> unsigned char rom[ROMSIZE]; unsigned int sum; diff --git a/sys/i386/boot/rawboot/Makefile b/sys/i386/boot/rawboot/Makefile index a7e142b..bb17969 100644 --- a/sys/i386/boot/rawboot/Makefile +++ b/sys/i386/boot/rawboot/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.7 1997/04/25 19:38:01 bde Exp $ +# $Id: Makefile,v 1.8 1998/01/31 01:20:56 yokota Exp $ # PROG= boot @@ -19,6 +19,12 @@ CFLAGS+= -DBOOTSEG=${BOOTSEG} -DBOOTSTACK=${BOOTSTACK} CFLAGS+= -I${.CURDIR}/../../.. CFLAGS+= ${CWARNFLAGS} +.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?=0x3F8 @@ -45,7 +51,7 @@ CFLAGS+= -DCONSPEED=${BOOT_COMCONSOLE_SPEED} # 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 rawboot sizetest +CLEANFILES+= boot.nohdr boot.strip machine rawboot sizetest LDFLAGS+= -N -T 0 -nostdlib NOSHARED= YES NOMAN= @@ -74,7 +80,12 @@ boot.nohdr: boot.strip rawboot: boot.nohdr dd if=boot.nohdr of=rawboot bs=8k count=1 conv=sync -all: rawboot +pre-compile: +.if !exists(${.OBJDIR}/machine) + ln -s ${.CURDIR}/../../include ${.OBJDIR}/machine +.endif + +all: pre-compile rawboot install: ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}\ |