aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/test
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-06-29 09:50:56 +0200
committermarha <marha@users.sourceforge.net>2012-06-29 09:50:56 +0200
commitf6d1847eef027266daa0f75ee92ceb09698b2761 (patch)
tree7ce3418e8255a636034d90be862167046c06473d /xorg-server/test
parent67551627d34fff4a0fbe719bce33a3bacb55ccef (diff)
downloadvcxsrv-f6d1847eef027266daa0f75ee92ceb09698b2761.tar.gz
vcxsrv-f6d1847eef027266daa0f75ee92ceb09698b2761.tar.bz2
vcxsrv-f6d1847eef027266daa0f75ee92ceb09698b2761.zip
xkeyboard-config xserver pixman mesa git update 29 Jun 2012
Diffstat (limited to 'xorg-server/test')
-rw-r--r--xorg-server/test/.gitignore1
-rw-r--r--xorg-server/test/Makefile.am2
-rw-r--r--xorg-server/test/xi2/Makefile.am2
3 files changed, 3 insertions, 2 deletions
diff --git a/xorg-server/test/.gitignore b/xorg-server/test/.gitignore
index 5d4fdfa99..23d4c8f4f 100644
--- a/xorg-server/test/.gitignore
+++ b/xorg-server/test/.gitignore
@@ -1,4 +1,5 @@
fixes
+hashtabletest
input
list
misc
diff --git a/xorg-server/test/Makefile.am b/xorg-server/test/Makefile.am
index b2a53aa64..a5a2e5c2b 100644
--- a/xorg-server/test/Makefile.am
+++ b/xorg-server/test/Makefile.am
@@ -20,7 +20,7 @@ INCLUDES += -I$(top_srcdir)/hw/xfree86/parser \
-I$(top_srcdir)/hw/xfree86/i2c -I$(top_srcdir)/hw/xfree86/modes \
-I$(top_srcdir)/hw/xfree86/ramdac
endif
-TEST_LDADD=libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS)
+TEST_LDADD=libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLX_SYS_LIBS)
if XORG
if SPECIAL_DTRACE_OBJECTS
diff --git a/xorg-server/test/xi2/Makefile.am b/xorg-server/test/xi2/Makefile.am
index 913ba0f8b..9de7abf5d 100644
--- a/xorg-server/test/xi2/Makefile.am
+++ b/xorg-server/test/xi2/Makefile.am
@@ -18,7 +18,7 @@ TESTS_ENVIRONMENT = $(XORG_MALLOC_DEBUG_ENV)
AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
INCLUDES = @XORG_INCS@
-TEST_LDADD=../libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS)
+TEST_LDADD=../libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLX_SYS_LIBS)
COMMON_SOURCES=protocol-common.h protocol-common.c
if SPECIAL_DTRACE_OBJECTS