aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/test/Makefile.am
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-10-12 19:43:36 +0000
committermarha <marha@users.sourceforge.net>2009-10-12 19:43:36 +0000
commit821ad28aad2f8c3cf4bbef9c8ac053943603cc67 (patch)
tree741a72dab536c86c7c3d815d93574d1404b42a51 /xorg-server/test/Makefile.am
parentf18b881b547c558dca584d68d45ace998fa49d18 (diff)
parent0c5e1ab504b4e8c56974a234bd440e9fa2f1f941 (diff)
downloadvcxsrv-821ad28aad2f8c3cf4bbef9c8ac053943603cc67.tar.gz
vcxsrv-821ad28aad2f8c3cf4bbef9c8ac053943603cc67.tar.bz2
vcxsrv-821ad28aad2f8c3cf4bbef9c8ac053943603cc67.zip
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/test/Makefile.am')
-rw-r--r--xorg-server/test/Makefile.am4
1 files changed, 4 insertions, 0 deletions
diff --git a/xorg-server/test/Makefile.am b/xorg-server/test/Makefile.am
index d8d89852b..7c4467161 100644
--- a/xorg-server/test/Makefile.am
+++ b/xorg-server/test/Makefile.am
@@ -9,6 +9,10 @@ AM_CFLAGS = $(DIX_CFLAGS) $(GLIB_CFLAGS) @XORG_CFLAGS@
INCLUDES = @XORG_INCS@
TEST_LDADD=libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLIB_LIBS)
+if SPECIAL_DTRACE_OBJECTS
+TEST_LDADD += $(OS_LIB) $(DIX_LIB)
+endif
+
xkb_LDADD=$(TEST_LDADD)
input_LDADD=$(TEST_LDADD)
xtest_LDADD=$(TEST_LDADD)