[src/trunk]: src/x11 Add -I${X11SRCDIR.xc}/lib/xtrans, -I${X11SRCDIR.xc}/lib/...

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

details:   https://anonhg.NetBSD.org/src/rev/d12a25deee39
branches:  trunk
changeset: 565373:d12a25deee39
user:      lukem <lukem%NetBSD.org@localhost>
date:      Mon Apr 05 12:03:25 2004 +0000

description:
Add -I${X11SRCDIR.xc}/lib/xtrans, -I${X11SRCDIR.xc}/lib/GL/glx, (etc)
as appropriate.
Based on fix from Hubert Feyrer, cross-checked with the native Imakefiles.

diffstat:

 x11/Xserver/GL/GLcore/Makefile.GLcore |  3 ++-
 x11/Xserver/os/Makefile               |  4 ++--
 x11/bin/lbxproxy/Makefile             |  6 +++---
 x11/lib/FS/Makefile                   |  4 +++-
 x11/lib/font/Makefile                 |  3 ++-
 5 files changed, 12 insertions(+), 8 deletions(-)

diffs (90 lines):

diff -r 9009ee4ca05c -r d12a25deee39 x11/Xserver/GL/GLcore/Makefile.GLcore
--- a/x11/Xserver/GL/GLcore/Makefile.GLcore     Mon Apr 05 12:01:42 2004 +0000
+++ b/x11/Xserver/GL/GLcore/Makefile.GLcore     Mon Apr 05 12:03:25 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.GLcore,v 1.5 2004/03/07 13:50:25 rtr Exp $
+#      $NetBSD: Makefile.GLcore,v 1.6 2004/04/05 12:03:25 lukem Exp $
 
 LIB=   GLcore
 
@@ -61,6 +61,7 @@
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/X11 \
                -I${DESTDIR}${X11INCDIR}/X11/extensions \
                -I${X11SRCDIR.xc}/extras/Mesa/include \
+               -I${X11SRCDIR.xc}/lib/GL/glx \
                -I${X11SRCDIR.xc}/lib/GL/include \
                -I${X11SRCDIR.xc}/extras/Mesa/src \
                -I${X11SRCDIR.xc}/programs/Xserver/include \
diff -r 9009ee4ca05c -r d12a25deee39 x11/Xserver/os/Makefile
--- a/x11/Xserver/os/Makefile   Mon Apr 05 12:01:42 2004 +0000
+++ b/x11/Xserver/os/Makefile   Mon Apr 05 12:03:25 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.10 2004/03/06 03:31:08 rtr Exp $
+#      $NetBSD: Makefile,v 1.11 2004/04/05 12:03:25 lukem Exp $
 
 .include "../Makefile.serverlib"
 
@@ -46,7 +46,7 @@
 CPPFLAGS.lbxio.c=      ${X11FLAGS.EXTENSION}
 CPPFLAGS.oscolor.c=    -DNDBM
 CPPFLAGS.osinit.c=     -DADMPATH=\"/var/log/X\%smsgs\"
-CPPFLAGS.transport.c=  -DBSD44SOCKETS
+CPPFLAGS.transport.c=  -DBSD44SOCKETS -I${X11SRCDIR.xc}/lib/xtrans
 CPPFLAGS.utils.c=      -DXDMCP ${X11FLAGS.EXTENSION}
 CPPFLAGS.xdmauth.c=    -DXDMCP
 COPTS.xdmauth.c=       -Wno-error      # XXX
diff -r 9009ee4ca05c -r d12a25deee39 x11/bin/lbxproxy/Makefile
--- a/x11/bin/lbxproxy/Makefile Mon Apr 05 12:01:42 2004 +0000
+++ b/x11/bin/lbxproxy/Makefile Mon Apr 05 12:03:25 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2003/11/17 05:18:20 lukem Exp $
+#      $NetBSD: Makefile,v 1.5 2004/04/05 12:03:25 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -32,8 +32,8 @@
 
 CPPFLAGS.connection.c+=        -DLBXPROXY_t -DTRANS_SERVER -DBSD44SOCKETS
 CPPFLAGS.io.c+=                -DLBXPROXY_t -DTRANS_SERVER ${X11FLAGS.EXTENSION}
-CPPFLAGS.transport.c+= -DLBXPROXY_t -DTRANS_SERVER -DBSD44SOCKETS
-
+CPPFLAGS.transport.c+= -DLBXPROXY_t -DTRANS_SERVER -DBSD44SOCKETS \
+                       -I${X11SRCDIR.xc}/lib/xtrans  
 
 .PATH:         ${X11SRCDIR.xc}/programs/${PROG}/config
 FILES=         AtomControl
diff -r 9009ee4ca05c -r d12a25deee39 x11/lib/FS/Makefile
--- a/x11/lib/FS/Makefile       Mon Apr 05 12:01:42 2004 +0000
+++ b/x11/lib/FS/Makefile       Mon Apr 05 12:03:25 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2003/10/20 05:12:40 jdolecek Exp $
+#      $NetBSD: Makefile,v 1.6 2004/04/05 12:03:25 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -16,6 +16,8 @@
 INCSDIR=${X11INCDIR}/X11/fonts
 
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/X11/fonts
+CPPFLAGS+=     -I${X11SRCDIR.xc}/lib/${LIB}
+CPPFLAGS+=     -I${X11SRCDIR.xc}/lib/xtrans
 
 CONN_DEFINES = ${X11FLAGS.CONNECTION} -DFS_t -DTRANS_CLIENT
 SOCK_DEFINES = -DBSD44SOCKETS
diff -r 9009ee4ca05c -r d12a25deee39 x11/lib/font/Makefile
--- a/x11/lib/font/Makefile     Mon Apr 05 12:01:42 2004 +0000
+++ b/x11/lib/font/Makefile     Mon Apr 05 12:03:25 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2004/03/06 03:05:39 rtr Exp $
+#      $NetBSD: Makefile,v 1.8 2004/04/05 12:03:25 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -41,6 +41,7 @@
 .for fn in ${SRCS.fc}
 CPPFLAGS.${fn}=        -I${DESTDIR}${X11INCDIR}/X11/fonts \
                -I${X11SRCDIR.xc}/lib/font/include \
+               -I${X11SRCDIR.xc}/lib/xtrans \
                -I${X11SRCDIR.xc}/include/fonts
 CPPFLAGS.${fn}+=${X11FLAGS.CONNECTION} -DFONT_t -DTRANS_CLIENT \
                -DTRANS_SERVER -DTRANS_REOPEN -DBSD44SOCKETS