aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/exa
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-11-14 08:34:43 +0100
committermarha <marha@users.sourceforge.net>2013-11-14 08:34:43 +0100
commit9837797b353b2e24e7ac96d3a74159497410c21a (patch)
tree3d4b6d9eb5e91d8b838610c1a04d738ad7f8ced4 /xorg-server/exa
parentcb9ef04f0bb4cc87787a113f61fcfa7c4818b29b (diff)
parent4c9f1ba041644329543e4ca21c0d95cf872f988e (diff)
downloadvcxsrv-9837797b353b2e24e7ac96d3a74159497410c21a.tar.gz
vcxsrv-9837797b353b2e24e7ac96d3a74159497410c21a.tar.bz2
vcxsrv-9837797b353b2e24e7ac96d3a74159497410c21a.zip
Merge remote-tracking branch 'origin/released'
* origin/released: mesa xserver git update 14 nov 2013
Diffstat (limited to 'xorg-server/exa')
-rw-r--r--xorg-server/exa/Makefile.am4
1 files changed, 0 insertions, 4 deletions
diff --git a/xorg-server/exa/Makefile.am b/xorg-server/exa/Makefile.am
index c1f1e8638..6a09966f8 100644
--- a/xorg-server/exa/Makefile.am
+++ b/xorg-server/exa/Makefile.am
@@ -1,9 +1,5 @@
noinst_LTLIBRARIES = libexa.la
-# Override these since EXA doesn't need them and the needed files aren't
-# built (in hw/xfree86/os-support/solaris) until after EXA is built
-SOLARIS_ASM_CFLAGS=""
-
if XORG
sdk_HEADERS = exa.h
endif