Module Name: src
Committed By: snj
Date: Mon Sep 28 01:57:05 UTC 2009
Modified Files:
src/external/mit/xorg/bin/xkbcomp [netbsd-5]: Makefile
src/external/mit/xorg/server/xorg-server/xkb [netbsd-5]: Makefile
Added Files:
src/external/mit/xorg/bin/xkbcomp [netbsd-5]: Makefile.common
Log Message:
Pull up following revision(s) (requested by mrg in ticket #1033):
external/mit/xorg/bin/xkbcomp/Makefile: revision 1.4
external/mit/xorg/bin/xkbcomp/Makefile.common: revision 1.1
external/mit/xorg/server/xorg-server/xkb/Makefile: revision 1.6
share XKBCOMPDIR between xkbcomp and xorg-server.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.8.1 -r1.1.1.1.8.2 \
src/external/mit/xorg/bin/xkbcomp/Makefile
cvs rdiff -u -r0 -r1.1.2.2 src/external/mit/xorg/bin/xkbcomp/Makefile.common
cvs rdiff -u -r1.3.8.2 -r1.3.8.3 \
src/external/mit/xorg/server/xorg-server/xkb/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xkbcomp/Makefile
diff -u src/external/mit/xorg/bin/xkbcomp/Makefile:1.1.1.1.8.1 src/external/mit/xorg/bin/xkbcomp/Makefile:1.1.1.1.8.2
--- src/external/mit/xorg/bin/xkbcomp/Makefile:1.1.1.1.8.1 Thu Sep 17 04:24:29 2009
+++ src/external/mit/xorg/bin/xkbcomp/Makefile Mon Sep 28 01:57:05 2009
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1.8.1 2009/09/17 04:24:29 snj Exp $
+# $NetBSD: Makefile,v 1.1.1.1.8.2 2009/09/28 01:57:05 snj 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
Index: src/external/mit/xorg/server/xorg-server/xkb/Makefile
diff -u src/external/mit/xorg/server/xorg-server/xkb/Makefile:1.3.8.2 src/external/mit/xorg/server/xorg-server/xkb/Makefile:1.3.8.3
--- src/external/mit/xorg/server/xorg-server/xkb/Makefile:1.3.8.2 Thu Sep 17 04:24:42 2009
+++ src/external/mit/xorg/server/xorg-server/xkb/Makefile Mon Sep 28 01:57:05 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3.8.2 2009/09/17 04:24:42 snj Exp $
+# $NetBSD: Makefile,v 1.3.8.3 2009/09/28 01:57:05 snj 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
Added files:
Index: src/external/mit/xorg/bin/xkbcomp/Makefile.common
diff -u /dev/null src/external/mit/xorg/bin/xkbcomp/Makefile.common:1.1.2.2
--- /dev/null Mon Sep 28 01:57:05 2009
+++ src/external/mit/xorg/bin/xkbcomp/Makefile.common Mon Sep 28 01:57:05 2009
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.common,v 1.1.2.2 2009/09/28 01:57:05 snj Exp $
+
+XKBCOMPDIR= /var/db/xkb
