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.
This commit is contained in:
Peter Wemm 1998-10-14 07:08:16 +00:00
parent 01a4eb824c
commit eb9022e791
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=40338
2 changed files with 20 additions and 5 deletions

View File

@ -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

View File

@ -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