[src/trunk]: src/x11/bin Explicitly add -I/path/to/dist/src so that any yacc-...

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f998fa89257a
branches:  trunk
changeset: 552305:f998fa89257a
user:      lukem <lukem%NetBSD.org@localhost>
date:      Tue Sep 23 11:04:45 2003 +0000

description:
Explicitly add -I/path/to/dist/src so that any yacc-generated .c files
in the .OBJDIR compile correctly.

(Something I changed in the last commit must have broken this.
Or make(1) changed.  Or something else borked.  In any case, it's fixed now.)

diffstat:

 x11/bin/pswrap/Makefile  |  7 +++++--
 x11/bin/twm/Makefile     |  4 ++--
 x11/bin/xgc/Makefile     |  4 ++--
 x11/bin/xkbcomp/Makefile |  4 +++-
 x11/bin/xkbevd/Makefile  |  3 ++-
 5 files changed, 14 insertions(+), 8 deletions(-)

diffs (92 lines):

diff -r fbf7c317532e -r f998fa89257a x11/bin/pswrap/Makefile
--- a/x11/bin/pswrap/Makefile   Tue Sep 23 11:02:46 2003 +0000
+++ b/x11/bin/pswrap/Makefile   Tue Sep 23 11:04:45 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2003/09/13 20:18:08 lukem Exp $
+#      $NetBSD: Makefile,v 1.3 2003/09/23 11:04:45 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -8,7 +8,10 @@
 
 YHEADER=1
 
-CPPFLAGS+=-DXENVIRONMENT -DFRIENDSFILE='"<DPS/dpsfriends.h>"' -I.
+CPPFLAGS+=     -DXENVIRONMENT \
+               -DFRIENDSFILE='"<DPS/dpsfriends.h>"' \
+               -I. \
+               -I${X11SRCDIR.xc}/config/pswrap
 
 pswpriv.h: pswparser.h
 
diff -r fbf7c317532e -r f998fa89257a x11/bin/twm/Makefile
--- a/x11/bin/twm/Makefile      Tue Sep 23 11:02:46 2003 +0000
+++ b/x11/bin/twm/Makefile      Tue Sep 23 11:04:45 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2003/09/13 20:18:12 lukem Exp $
+#      $NetBSD: Makefile,v 1.3 2003/09/23 11:04:46 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -8,7 +8,7 @@
        cursor.c icons.c session.c
 
 YHEADER=1
-CPPFLAGS+=-I. -DHAS_MKSTEMP
+CPPFLAGS+=             -I. -I${X11SRCDIR.xc}/programs/${PROG} -DHAS_MKSTEMP
 CPPFLAGS.parse.c=      -DSYSTEM_INIT_FILE=\"${X11LIBDIR}/twm/system.twmrc\"
 
 FILES= system.twmrc
diff -r fbf7c317532e -r f998fa89257a x11/bin/xgc/Makefile
--- a/x11/bin/xgc/Makefile      Tue Sep 23 11:02:46 2003 +0000
+++ b/x11/bin/xgc/Makefile      Tue Sep 23 11:04:45 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2003/09/13 20:18:21 lukem Exp $
+#      $NetBSD: Makefile,v 1.3 2003/09/23 11:04:46 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -7,7 +7,7 @@
        choice.c main.c interpret.c record.c testfrac.c gram.y lex.l
 
 YHEADER=1
-CPPFLAGS+=-I.
+CPPFLAGS+=-I. -I${X11SRCDIR.xc}/programs/${PROG}
 
 APPDEFS=Xgc.ad
 
diff -r fbf7c317532e -r f998fa89257a x11/bin/xkbcomp/Makefile
--- a/x11/bin/xkbcomp/Makefile  Tue Sep 23 11:02:46 2003 +0000
+++ b/x11/bin/xkbcomp/Makefile  Tue Sep 23 11:04:45 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2003/09/13 20:18:22 lukem Exp $
+#      $NetBSD: Makefile,v 1.3 2003/09/23 11:04:47 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -8,7 +8,9 @@
        symbols.c geometry.c xkbpath.c listing.c \
        xkbparse.y parseutils.c utils.c
 
+CPPFLAGS+=             -I${X11SRCDIR.xc}/programs/${PROG}
 CPPFLAGS.xkbpath.c=    -DDFLT_XKB_CONFIG_ROOT=\"${X11LIBDIR}/xkb\"
+CPPFLAGS.geometry.c=   -Wno-error      # XXX
 
 FILESDIR=${X11LIBDIR}/xkb
 FILES= README README.config README.enhancing
diff -r fbf7c317532e -r f998fa89257a x11/bin/xkbevd/Makefile
--- a/x11/bin/xkbevd/Makefile   Tue Sep 23 11:02:46 2003 +0000
+++ b/x11/bin/xkbevd/Makefile   Tue Sep 23 11:04:45 2003 +0000
@@ -1,10 +1,11 @@
-#      $NetBSD: Makefile,v 1.2 2003/09/13 20:18:29 lukem Exp $
+#      $NetBSD: Makefile,v 1.3 2003/09/23 11:04:47 lukem Exp $
 
 .include <bsd.own.mk>
 
 PROG=  xkbevd
 SRCS=  xkbevd.c cfgscan.c cfgparse.y evargs.c printev.c utils.c
 
+CPPFLAGS+=-I${X11SRCDIR.xc}/programs/${PROG}
 LDADD+=        -lxkbfile -lXext -lX11
 DPADD+=        ${LIBXKBFILE} ${LIBXEXT} ${LIBX11}