diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/gallium/state_trackers/xorg/.gitignore | 1 | ||||
| -rw-r--r-- | src/gallium/state_trackers/xorg/Makefile | 23 | ||||
| -rw-r--r-- | src/gallium/state_trackers/xorg/Makefile.am | 57 |
4 files changed, 59 insertions, 23 deletions
diff --git a/configure.ac b/configure.ac index 1d17f591df4..6d3a3f58d1b 100644 --- a/configure.ac +++ b/configure.ac @@ -2051,6 +2051,7 @@ AC_CONFIG_FILES([configs/current src/gallium/state_trackers/vdpau/Makefile src/gallium/state_trackers/vega/Makefile src/gallium/state_trackers/xa/Makefile + src/gallium/state_trackers/xorg/Makefile src/gallium/targets/Makefile src/gallium/targets/opencl/Makefile src/gallium/winsys/Makefile diff --git a/src/gallium/state_trackers/xorg/.gitignore b/src/gallium/state_trackers/xorg/.gitignore new file mode 100644 index 00000000000..f3c7a7c5da6 --- /dev/null +++ b/src/gallium/state_trackers/xorg/.gitignore @@ -0,0 +1 @@ +Makefile diff --git a/src/gallium/state_trackers/xorg/Makefile b/src/gallium/state_trackers/xorg/Makefile deleted file mode 100644 index d42ea5416dc..00000000000 --- a/src/gallium/state_trackers/xorg/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -TOP = ../../../.. -include $(TOP)/configs/current - -LIBNAME = xorgtracker - -LIBRARY_INCLUDES = \ - -DHAVE_CONFIG_H \ - $(shell $(PKG_CONFIG) xextproto --atleast-version=7.0.99.1 \ - && echo "-DHAVE_XEXTPROTO_71") \ - $(shell $(PKG_CONFIG) libkms --atleast-version=1.0 \ - && echo "-DHAVE_LIBKMS") \ - $(shell $(PKG_CONFIG) libkms --silence-errors --cflags-only-I) \ - $(shell $(PKG_CONFIG) --cflags-only-I pixman-1 xorg-server libdrm xproto dri2proto) \ - -I$(TOP)/src/gallium/include \ - -I$(TOP)/src/gallium/auxiliary \ - -I$(TOP)/include \ - -I$(TOP)/src/mesa \ - -I$(TOP)/src/mesa/drivers/dri/common \ - -I$(TOP)/src/mesa/main - -C_SOURCES = $(wildcard ./*.c) - -include ../../Makefile.template diff --git a/src/gallium/state_trackers/xorg/Makefile.am b/src/gallium/state_trackers/xorg/Makefile.am new file mode 100644 index 00000000000..dcb49add47c --- /dev/null +++ b/src/gallium/state_trackers/xorg/Makefile.am @@ -0,0 +1,57 @@ +# Copyright © 2012 Intel Corporation +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. + +include $(top_srcdir)/src/gallium/Automake.inc + +AM_CFLAGS = \ + $(GALLIUM_CFLAGS) \ + $(XEXT_CFLAGS) \ + $(LIBKMS_XORG_CFLAGS) \ + $(LIBDRM_XORG_CFLAGS) \ + $(shell $(PKG_CONFIG) --cflags-only-I xorg-server) +AM_CPPFLAGS = \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/mesa \ + -I$(top_srcdir)/src/mesa/drivers/dri/common \ + -I$(top_srcdir)/src/mesa/main \ + -DHAVE_CONFIG_H \ + -DHAVE_LIBKMS + +noinst_LTLIBRARIES = libxorgtracker.la + +libxorgtracker_la_SOURCES = \ + xorg_composite.c \ + xorg_crtc.c \ + xorg_dri2.c \ + xorg_driver.c \ + xorg_exa.c \ + xorg_exa_tgsi.c \ + xorg_output.c \ + xorg_renderer.c \ + xorg_xv.c \ + xorg_xvmc.c + +#XXX: Delete this when all targets that rely on xorgtracker are converted to automake. +all-local: libxorgtracker.la + ln -f $(builddir)/.libs/libxorgtracker.a $(builddir)/libxorgtracker.a + +CLEANFILES = libxorgtracker.a |