include path fixes for gcc3.

tests otto@, okay millert@

10 files changed, 20 insertions, 19 deletions

diff --git a/bin/systrace/Makefile b/bin/systrace/Makefile
index 7c940cb0d25..d76b603f49c 100644
--- a/bin/systrace/Makefile
+++ b/bin/systrace/Makefile
@@ -1,7 +1,7 @@
-#	$OpenBSD: Makefile,v 1.10 2003/11/20 23:23:09 avsm Exp $
+#	$OpenBSD: Makefile,v 1.11 2004/01/05 02:55:28 espie Exp $
 
 PROG=	systrace
-CFLAGS+=-I.
+CFLAGS+=-I. -I${.CURDIR}
 CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith \
 	-Wno-uninitialized
 CFLAGS+=-DYY_NO_UNPUT
diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile
index 2cbf19615c3..d5ae617e5cb 100644
--- a/libexec/ftpd/Makefile
+++ b/libexec/ftpd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.21 2002/01/25 06:33:23 mpech Exp $
+#	$OpenBSD: Makefile,v 1.22 2004/01/05 02:55:28 espie Exp $
 #	$NetBSD: Makefile,v 1.13 1996/02/16 02:07:41 cgd Exp $
 #	@(#)Makefile	8.2 (Berkeley) 4/4/94
 
@@ -15,7 +15,7 @@ YFLAGS=
 LSDIR	= ${.CURDIR}/../../bin/ls
 .PATH:	${LSDIR}
 SRCS	+= ls.c cmp.c print.c util.c
-CFLAGS	+= -I${LSDIR}
+CFLAGS	+= -I${.CURDIR} -I${LSDIR}
 
 # not really used
 CPPFLAGS+=-DINET6
diff --git a/sbin/pfctl/Makefile b/sbin/pfctl/Makefile
index cf9025963c6..2e3d14ec64e 100644
--- a/sbin/pfctl/Makefile
+++ b/sbin/pfctl/Makefile
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile,v 1.13 2003/08/21 19:12:08 frantzen Exp $
+#	$OpenBSD: Makefile,v 1.14 2004/01/05 02:55:28 espie Exp $
 
 PROG=	pfctl
 SRCS=	pfctl.c parse.y pfctl_parser.c pf_print_state.c pfctl_altq.c pfctl_osfp.c
 SRCS+=	pfctl_radix.c pfctl_table.c pfctl_qstats.c
 CFLAGS+= -Wall -Wmissing-prototypes -Wno-uninitialized
-CFLAGS+= -Wstrict-prototypes
+CFLAGS+= -Wstrict-prototypes -I${.CURDIR}
 YFLAGS=
 MAN=	pfctl.8
 
diff --git a/sbin/wsconsctl/Makefile b/sbin/wsconsctl/Makefile
index 8a8e7e7ed0c..63310ff3d50 100644
--- a/sbin/wsconsctl/Makefile
+++ b/sbin/wsconsctl/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.12 2003/10/31 04:05:29 drahn Exp $
+#	$OpenBSD: Makefile,v 1.13 2004/01/05 02:55:28 espie Exp $
 
 .if ${MACHINE} == "i386" || ${MACHINE} == "alpha" || ${MACHINE} == "hppa" || \
     ${MACHINE} == "macppc" || ${MACHINE} == "sparc" || \
@@ -8,7 +8,7 @@ PROG=	wsconsctl
 SRCS=	display.c keyboard.c keysym.c map_parse.y map_scan.l \
 	mouse.c util.c wsconsctl.c
 
-CPPFLAGS+=	-I.
+CPPFLAGS+=	-I${.CURDIR} -I.
 CLEANFILES+=	keysym.h y.tab.h
 
 beforedepend: keysym.h
diff --git a/usr.bin/keynote/Makefile b/usr.bin/keynote/Makefile
index 3610ddd2f72..eaf82d155d1 100644
--- a/usr.bin/keynote/Makefile
+++ b/usr.bin/keynote/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.10 2002/05/11 00:20:20 espie Exp $
+#	$OpenBSD: Makefile,v 1.11 2004/01/05 02:55:28 espie Exp $
 
 PROG=	keynote
 SRCS=	keynote-sign.c keynote-keygen.c keynote-sigver.c keynote-verify.c \
 	keynote-main.c z.tab.c lex.kv.c
-CFLAGS+= -Wall -DCRYPTO -DHAVE_CONFIG_H -I. -I${.CURDIR}
+CFLAGS+= -Wall -DCRYPTO -DHAVE_CONFIG_H -I. -I${.CURDIR} -I${.CURDIR}/../../lib/libkeynote
 LEXFLAGS2= -Pkv -s -i
 YACCFLAGS2= -d -p kv -b z
 DPADD=	${LIBKEYNOTE} ${LIBM} ${LIBCRYPTO}
diff --git a/usr.bin/rdist/Makefile b/usr.bin/rdist/Makefile
index bfbdb4c388f..98f0126822b 100644
--- a/usr.bin/rdist/Makefile
+++ b/usr.bin/rdist/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.14 2003/07/22 17:15:13 brad Exp $
+#	$OpenBSD: Makefile,v 1.15 2004/01/05 02:55:28 espie Exp $
 
 
 PROG=	rdist
-CFLAGS+=-I. -DOS_H=\"os-openbsd.h\"
+CFLAGS+=-I. -I${.CURDIR} -DOS_H=\"os-openbsd.h\"
 SRCS=	gram.y child.c client.c common.c distopt.c docmd.c expand.c \
 	isexec.c lookup.c message.c rdist.c
 CLEANFILES+=gram.c y.tab.h
diff --git a/usr.bin/xlint/lint1/Makefile b/usr.bin/xlint/lint1/Makefile
index 6caf124f2c6..b076d2fac4f 100644
--- a/usr.bin/xlint/lint1/Makefile
+++ b/usr.bin/xlint/lint1/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 2001/09/11 00:06:28 jason Exp $
+#	$OpenBSD: Makefile,v 1.4 2004/01/05 02:55:28 espie Exp $
 #	$NetBSD: Makefile,v 1.3 1995/07/04 01:53:05 cgd Exp $
 
 PROG=	lint1
@@ -8,7 +8,7 @@ NOMAN=
 LDADD+=	-ll
 DPADD+=	${LIBL}
 YFLAGS=	-d
-CFLAGS+=-I.
+CFLAGS+=-I. -I${.CURDIR}
 LINTFLAGS=-aehpz
 CLEANFILES+=y.tab.h cgram.c scan.c
 
diff --git a/usr.sbin/afs/usr.sbin/ydr/Makefile b/usr.sbin/afs/usr.sbin/ydr/Makefile
index afadbc18451..86d5390a22d 100644
--- a/usr.sbin/afs/usr.sbin/ydr/Makefile
+++ b/usr.sbin/afs/usr.sbin/ydr/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.2 2003/08/05 11:11:42 hin Exp $
+#	$OpenBSD: Makefile,v 1.3 2004/01/05 02:55:28 espie Exp $
 
 AFSTOPDIR=	../..
 .include <../../Makefile.inc>
@@ -16,7 +16,7 @@ MAN		=
 BINDIR		= ${DESTDIR}/usr/bin
 PROG		= ydr
 
-CFLAGS		+= -I${AFSSRC}/util -I.
+CFLAGS		+= -I${AFSSRC}/util -I${AFSSRC}/ydr -I.
 
 .PATH:	${AFSSRC}/ydr ${AFSSRC}/util
 
diff --git a/usr.sbin/bgpd/Makefile b/usr.sbin/bgpd/Makefile
index 43b5a56ee95..fa370813bb0 100644
--- a/usr.sbin/bgpd/Makefile
+++ b/usr.sbin/bgpd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.11 2004/01/02 00:04:07 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.12 2004/01/05 02:55:28 espie Exp $
 
 .PATH:		${.CURDIR}/..
 
@@ -6,7 +6,7 @@ PROG=	bgpd
 SRCS=	bgpd.c buffer.c session.c log.c parse.y config.c imsg.c \
 	rde.c rde_rib.c rde_decide.c rde_prefix.c mrt.c kroute.c \
 	control.c
-CFLAGS+= -Wall
+CFLAGS+= -Wall -I${.CURDIR}
 CFLAGS+= -Wstrict-prototypes -Wmissing-prototypes
 CLFAGS+= -Wmissing-declarations -Wredundant-decls
 CFLAGS+= -Wshadow -Wpointer-arith -Wcast-qual
diff --git a/usr.sbin/mrouted/Makefile b/usr.sbin/mrouted/Makefile
index 5c65d4847d1..15ed2d1efb8 100644
--- a/usr.sbin/mrouted/Makefile
+++ b/usr.sbin/mrouted/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.4 2002/08/01 03:45:53 itojun Exp $
+#	$OpenBSD: Makefile,v 1.5 2004/01/05 02:55:28 espie Exp $
 
 PROG=	mrouted
 SRCS=	callout.c cfparse.c config.c igmp.c inet.c kern.c main.c prune.c \
@@ -6,6 +6,7 @@ SRCS=	callout.c cfparse.c config.c igmp.c inet.c kern.c main.c prune.c \
 MAN=	mrouted.8
 
 LDADD+=	-lutil
+CFLAGS+=-I${.CURDIR}
 DPADD+=	${LIBUTIL}
 
 CLEANFILES+= cfparse.c y.tab.h