aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xfree86
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-01-17 09:07:57 +0100
committermarha <marha@users.sourceforge.net>2012-01-17 09:07:57 +0100
commit05accdf525b82a20be8e92789185d8537bc4ab81 (patch)
tree05bc88963d29df95f0a7c63cad7ce773e093b632 /xorg-server/hw/xfree86
parent3e85e2f1e33380d6c9efe0972ed475cbf9dbe825 (diff)
parent34c1e86406451a3604de4982339058088434ab40 (diff)
downloadvcxsrv-05accdf525b82a20be8e92789185d8537bc4ab81.tar.gz
vcxsrv-05accdf525b82a20be8e92789185d8537bc4ab81.tar.bz2
vcxsrv-05accdf525b82a20be8e92789185d8537bc4ab81.zip
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server/hw/xfree86')
-rw-r--r--xorg-server/hw/xfree86/dixmods/Makefile.am1
-rw-r--r--xorg-server/hw/xfree86/sdksyms.sh1
2 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/hw/xfree86/dixmods/Makefile.am b/xorg-server/hw/xfree86/dixmods/Makefile.am
index b6eb54f16..a5be3ae00 100644
--- a/xorg-server/hw/xfree86/dixmods/Makefile.am
+++ b/xorg-server/hw/xfree86/dixmods/Makefile.am
@@ -65,4 +65,3 @@ libdixmods_la_SOURCES = $(top_srcdir)/mi/miinitext.c
libdixmods_la_CFLAGS = -DXFree86LOADER $(AM_CFLAGS)
libxorgxkb_la_SOURCES = xkbVT.c xkbPrivate.c xkbKillSrv.c
-libxorgxkb_la_LIBADD = $(top_builddir)/dix/libdix.la
diff --git a/xorg-server/hw/xfree86/sdksyms.sh b/xorg-server/hw/xfree86/sdksyms.sh
index 4a4e1f64d..9034f3829 100644
--- a/xorg-server/hw/xfree86/sdksyms.sh
+++ b/xorg-server/hw/xfree86/sdksyms.sh
@@ -324,6 +324,7 @@ topdir=$1
shift
LC_ALL=C
export LC_ALL
+${CPP:-cpp} "$@" -DXorgLoader sdksyms.c > /dev/null || exit $?
${CPP:-cpp} "$@" -DXorgLoader sdksyms.c | ${AWK:-awk} -v topdir=$topdir '
BEGIN {
sdk = 0;