[src/trunk]: src/external/mit/xorg share XKBCOMPDIR between xkbcomp and xorg-...

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

details:   https://anonhg.NetBSD.org/src/rev/ff713bd91ed4
branches:  trunk
changeset: 747628:ff713bd91ed4
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Sep 25 06:07:06 2009 +0000

description:
share XKBCOMPDIR between xkbcomp and xorg-server.

diffstat:

 external/mit/xorg/bin/xkbcomp/Makefile            |   5 ++---
 external/mit/xorg/bin/xkbcomp/Makefile.common     |   3 +++
 external/mit/xorg/server/xorg-server/xkb/Makefile |  14 ++++++++------
 3 files changed, 13 insertions(+), 9 deletions(-)

diffs (60 lines):

diff -r 23c0f60bda3b -r ff713bd91ed4 external/mit/xorg/bin/xkbcomp/Makefile
--- a/external/mit/xorg/bin/xkbcomp/Makefile    Fri Sep 25 06:06:04 2009 +0000
+++ b/external/mit/xorg/bin/xkbcomp/Makefile    Fri Sep 25 06:07:06 2009 +0000
@@ -1,6 +1,7 @@
-#      $NetBSD: Makefile,v 1.3 2009/08/22 01:06:02 mrg Exp $
+#      $NetBSD: Makefile,v 1.4 2009/09/25 06:07:06 mrg Exp $
 
 .include <bsd.own.mk>
+.include "Makefile.common"
 
 PROG=  xkbcomp
 SRCS=  xkbcomp.c xkbscan.c expr.c vmod.c indicators.c misc.c \
@@ -8,11 +9,9 @@
        symbols.c geometry.c xkbpath.c listing.c \
        xkbparse.y parseutils.c utils.c
 
-XKBCOMPDIR=            /var/db/xkb
 CPPFLAGS.xkbpath.c=    -DDFLT_XKB_CONFIG_ROOT=\"${XKBCOMPDIR}\"
 
 CPPFLAGS+=             -I${X11SRCDIR.${PROG}} -I${X11SRCDIR.${PROG}}/../include -DHAVE_CONFIG_H
-CPPFLAGS.xkbpath.c=    -DDFLT_XKB_CONFIG_ROOT=\"${X11LIBDIR}/xkb\"
 CPPFLAGS.geometry.c=   -Wno-error      # XXX
 
 FILESDIR=${X11LIBDIR}/xkb
diff -r 23c0f60bda3b -r ff713bd91ed4 external/mit/xorg/bin/xkbcomp/Makefile.common
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/bin/xkbcomp/Makefile.common     Fri Sep 25 06:07:06 2009 +0000
@@ -0,0 +1,3 @@
+#      $NetBSD: Makefile.common,v 1.1 2009/09/25 06:07:06 mrg Exp $
+
+XKBCOMPDIR=            /var/db/xkb
diff -r 23c0f60bda3b -r ff713bd91ed4 external/mit/xorg/server/xorg-server/xkb/Makefile
--- a/external/mit/xorg/server/xorg-server/xkb/Makefile Fri Sep 25 06:06:04 2009 +0000
+++ b/external/mit/xorg/server/xorg-server/xkb/Makefile Fri Sep 25 06:07:06 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2009/06/11 05:43:19 mrg Exp $
+#      $NetBSD: Makefile,v 1.6 2009/09/25 06:07:06 mrg Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -30,12 +30,14 @@
                -I${X11SRCDIR.xorg-server}/hw/xfree86/common \
                -I${X11SRCDIR.xorg-server}/../include
 
-CPPFLAGS+=     -DXKB_IN_SERVER -DHAVE_XKB_CONFIG_H
+# For ${XKBCOMPDIR}
+.include "../../../bin/xkbcomp/Makefile.common"
 
-CPPFLAGS.xkbInit.c=    -DXKB_BASE_DIRECTORY=\"${X11LIBDIR}/xkb\" \
-                       -DXKB_BIN_DIRECTORY=\"${X11BINDIR}\" \
-                       -DXKM_OUTPUT_DIR=\"${X11LIBDIR}/xkb/compiled\" \
-                       -DXKB_DFLT_DISABLED=0
+CPPFLAGS+=     -DXKB_IN_SERVER -DHAVE_XKB_CONFIG_H \
+               -DXKB_BASE_DIRECTORY=\"${X11LIBDIR}/xkb\" \
+               -DXKB_BIN_DIRECTORY=\"${X11BINDIR}\" \
+               -DXKM_OUTPUT_DIR=\"${XKBCOMPDIR}\" \
+               -DXKB_DFLT_DISABLED=0
 
 COPTS.XKBAlloc.c=      -Wno-error      # XXX gcc 3.3
 COPTS.XKBMAlloc.c=     -Wno-error      # XXX gcc 3.3