aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw
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/hw
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/hw')
-rw-r--r--xorg-server/hw/xfree86/Makefile.am11
1 files changed, 0 insertions, 11 deletions
diff --git a/xorg-server/hw/xfree86/Makefile.am b/xorg-server/hw/xfree86/Makefile.am
index 485386fc5..15670d01d 100644
--- a/xorg-server/hw/xfree86/Makefile.am
+++ b/xorg-server/hw/xfree86/Makefile.am
@@ -80,17 +80,6 @@ BUILT_SOURCES = xorg.conf.example
DISTCLEANFILES = xorg.conf.example
EXTRA_DIST = xorgconf.cpp
-if SOLARIS_ASM_INLINE
-# Needs to be built before any files are compiled when using Sun compilers
-# so in*/out* inline definitions are properly processed.
-
-BUILT_SOURCES += os-support/solaris/solaris-@SOLARIS_INOUT_ARCH@.il
-
-os-support/solaris/solaris-@SOLARIS_INOUT_ARCH@.il:
- cd os-support/solaris ; \
- $(MAKE) $(AM_MAKEFLAGS) solaris-@SOLARIS_INOUT_ARCH@.il
-endif
-
# Without logdir, X will post an error on the terminal and will not start
install-data-local:
$(AM_V_GEN)$(MKDIR_P) $(DESTDIR)$(logdir)