diff options
| author | peter <peter@FreeBSD.org> | 1998-10-14 07:08:16 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1998-10-14 07:08:16 +0000 |
| commit | 5e3acbf57ecc36c62f6b23d1501f02c9717a65d5 (patch) | |
| tree | 22d1bb22d8e14b49c2a3cf4b126c01fdc1fea6f1 /sys/boot/i386 | |
| parent | 995f10982005f3549e7f40ad95e12bd69088584c (diff) | |
| download | FreeBSD-src-5e3acbf57ecc36c62f6b23d1501f02c9717a65d5.zip FreeBSD-src-5e3acbf57ecc36c62f6b23d1501f02c9717a65d5.tar.gz | |
Try and get the sys/* and machine/* includes via relative paths. This
saves having to do a 'make includes' after touching any header file for
the boot code.
Diffstat (limited to 'sys/boot/i386')
| -rw-r--r-- | sys/boot/i386/libi386/Makefile | 13 | ||||
| -rw-r--r-- | sys/boot/i386/loader/Makefile | 12 |
2 files changed, 20 insertions, 5 deletions
diff --git a/sys/boot/i386/libi386/Makefile b/sys/boot/i386/libi386/Makefile index 8eaed19..ec22662 100644 --- a/sys/boot/i386/libi386/Makefile +++ b/sys/boot/i386/libi386/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.6 1998/09/30 19:48:09 peter Exp $ +# $Id: Makefile,v 1.7 1998/09/30 22:36:45 peter Exp $ # LIB= i386 NOPIC= @@ -9,9 +9,18 @@ INTERNALSTATICLIB= true SRCS= aout_freebsd.c biosdisk.c biosmem.c bootinfo.c comconsole.c \ devicename.c elf_freebsd.c gatea20.c i386_copy.c i386_module.c time.c vidconsole.c -CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../btx/lib +CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../btx/lib \ + -I${.CURDIR}/../../.. -I. # Make the disk code more talkative #CFLAGS+= -DDISK_DEBUG + +machine: + ln -sf ${.CURDIR}/../../../i386/include machine + +CLEANFILES+= machine + .include <bsd.lib.mk> + +beforedepend ${OBJS}: machine diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile index 9497c95..02fd2d0 100644 --- a/sys/boot/i386/loader/Makefile +++ b/sys/boot/i386/loader/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.10 1998/10/07 02:39:32 msmith Exp $ +# $Id: Makefile,v 1.11 1998/10/12 01:03:00 rnordier Exp $ BASE= loader PROG= ${BASE} @@ -17,7 +17,8 @@ SRCS= main.c conf.c # Always add MI sources .PATH: ${.CURDIR}/../../common .include <${.CURDIR}/../../common/Makefile.inc> -CFLAGS+= -I${.CURDIR}/../../common -I. +CFLAGS+= -I${.CURDIR}/../../common +CFLAGS+= -I${.CURDIR}/../../.. -I. CLEANFILES+= vers.c vers.o ${BASE}.list setdef0.o setdef1.o setdefs.h \ gensetdefs.o gensetdefs ${BASE}.bin @@ -68,6 +69,11 @@ setdef0.o: setdefs.h setdef1.o: setdefs.h +machine: + ln -sf ${.CURDIR}/../../../i386/include machine + +CLEANFILES+= machine + .include <bsd.prog.mk> # Linker set gymnastics @@ -81,4 +87,4 @@ gensetdefs: gensetdefs.o gensetdefs.o: gensetdefs.c ${CC} -c $< - +beforedepend ${OBJS}: machine |
