Module Name: src
Committed By: he
Date: Wed Apr 13 11:10:50 UTC 2011
Modified Files:
src/sys/arch/x68k/stand/loadbsd: Makefile
Log Message:
Convert to using -nostdinc, and set include paths and create symlinks
so that we include the source tree's sys/, machine/ and m68k/ headers,
and only as a last resort use DESTDIR's /usr/include. For some reason
the host's bootinfo.h got included ahead of the x68k variant, causing
a build failure in my case.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/x68k/stand/loadbsd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x68k/stand/loadbsd/Makefile
diff -u src/sys/arch/x68k/stand/loadbsd/Makefile:1.12 src/sys/arch/x68k/stand/loadbsd/Makefile:1.13
--- src/sys/arch/x68k/stand/loadbsd/Makefile:1.12 Thu Jun 29 03:46:43 2006
+++ src/sys/arch/x68k/stand/loadbsd/Makefile Wed Apr 13 11:10:49 2011
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2006/06/29 03:46:43 lukem Exp $
+# $NetBSD: Makefile,v 1.13 2011/04/13 11:10:49 he Exp $
+
+S= ${.CURDIR}/../../../..
BASE= loadbsd
PROG= ${BASE}.x # Human68k ".x" executable
@@ -20,12 +22,22 @@
CPPFLAGS= -W -Wall -O -fomit-frame-pointer
CPPFLAGS+= -m68000 -Wa,-mc68000
+CPPFLAGS+= -nostdinc
+CPPFLAGS+= -I$S -I.
CPPFLAGS+= -I${.CURDIR}/../libdos -I${.CURDIR}/../libiocs
+CPPFLAGS+= -I${DESTDIR}/usr/include
LDFLAGS= -nostdlib -static -N
LDLIBS= -L${LIBDOS} -ldos -L${LIBIOCS} -liocs -L${DESTDIR}/usr/lib -lc
DPADD+= ${AOUT2HUX}
CLEANFILES+= ${BASE}1 ${BASE}2
+CLEANFILES+= machine m68k
+
+.if !make(obj) && !make(clean) && !make(cleandir)
+.BEGIN:
+ rm -f machine && ln -s $S/arch/x68k/include machine
+ rm -f m68k && ln -s $S/arch/m68k/include m68k
+.endif
${PROG}: ${BASE}1 ${BASE}2
${_MKTARGET_LINK}
