From 69b69b1a0ba8118ff105baf53effafc0a8c0f2dd Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Sat, 19 Jan 2013 11:23:51 -0800 Subject: build: Stop using GALLIUM_STATE_TRACKERS_DIRS for SUBDIRS configure still uses it to print the enabled state trackers. Tested-by: Emil Velikov Reviewed-and-Tested-by: Andreas Boll Reviewed-by: Jordan Justen --- src/gallium/state_trackers/Makefile.am | 65 ++++++++++++++++++++++++++++------ 1 file changed, 54 insertions(+), 11 deletions(-) (limited to 'src/gallium/state_trackers') diff --git a/src/gallium/state_trackers/Makefile.am b/src/gallium/state_trackers/Makefile.am index ef339d4f01a..c788f9a781e 100644 --- a/src/gallium/state_trackers/Makefile.am +++ b/src/gallium/state_trackers/Makefile.am @@ -1,4 +1,4 @@ -# Copyright © 2012 Intel Corporation +# Copyright © 2013 Intel Corporation # # Permission is hereby granted, free of charge, to any person obtaining a # copy of this software and associated documentation files (the "Software"), @@ -11,13 +11,56 @@ # 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. - -SUBDIRS = $(GALLIUM_STATE_TRACKERS_DIRS) +# 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. + +SUBDIRS = + +if HAVE_X11_DRIVER +SUBDIRS += glx +endif + +if HAVE_OSMESA +SUBDIRS += osmesa +endif + +if HAVE_DRI +SUBDIRS += dri +endif + +if HAVE_GALLIUM_EGL +SUBDIRS += egl +endif + +if HAVE_GALLIUM_GBM +SUBDIRS += gbm +endif + +if HAVE_ST_XORG +SUBDIRS += xorg +endif + +if HAVE_ST_XA +SUBDIRS += xa +endif + +if HAVE_OPENVG +SUBDIRS += vega +endif + +if HAVE_ST_XVMC +SUBDIRS += xvmc +endif + +if HAVE_ST_VDPAU +SUBDIRS += vdpau +endif + +if HAVE_CLOVER +SUBDIRS += clover +endif -- cgit v1.2.3