diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/gallium/Makefile.am | 49 | ||||
| -rw-r--r-- | src/gallium/state_trackers/Makefile.am | 66 |
4 files changed, 49 insertions, 68 deletions
diff --git a/configure.ac b/configure.ac index b4e32a70c74..4f7b1f3ae1c 100644 --- a/configure.ac +++ b/configure.ac @@ -2225,7 +2225,6 @@ AC_CONFIG_FILES([Makefile src/gallium/drivers/svga/Makefile src/gallium/drivers/trace/Makefile src/gallium/drivers/vc4/Makefile - src/gallium/state_trackers/Makefile src/gallium/state_trackers/clover/Makefile src/gallium/state_trackers/dri/Makefile src/gallium/state_trackers/egl/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 94299f9664a..4193fe82ae4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -51,7 +51,6 @@ if HAVE_GALLIUM SUBDIRS += \ gallium/auxiliary \ gallium \ - gallium/state_trackers \ gallium/targets if HAVE_GALLIUM_TESTS diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am index fcbd6cbc6aa..ceb38b7943c 100644 --- a/src/gallium/Makefile.am +++ b/src/gallium/Makefile.am @@ -102,3 +102,52 @@ endif if NEED_WINSYS_WRAPPER SUBDIRS += winsys/sw/wrapper endif + + +## +## Gallium state trackers +## + +if HAVE_CLOVER +SUBDIRS += state_trackers/clover +endif + +if HAVE_DRICOMMON +SUBDIRS += state_trackers/dri +endif + +if HAVE_GALLIUM_EGL +SUBDIRS += state_trackers/egl +endif + +if HAVE_GALLIUM_GBM +SUBDIRS += state_trackers/gbm +endif + +if HAVE_X11_DRIVER +SUBDIRS += state_trackers/glx/xlib +endif + +if HAVE_ST_OMX +SUBDIRS += state_trackers/omx +endif + +if HAVE_GALLIUM_OSMESA +SUBDIRS += state_trackers/osmesa +endif + +if HAVE_ST_VDPAU +SUBDIRS += state_trackers/vdpau +endif + +if HAVE_OPENVG +SUBDIRS += state_trackers/vega +endif + +if HAVE_ST_XA +SUBDIRS += state_trackers/xa +endif + +if HAVE_ST_XVMC +SUBDIRS += state_trackers/xvmc +endif diff --git a/src/gallium/state_trackers/Makefile.am b/src/gallium/state_trackers/Makefile.am deleted file mode 100644 index 3ced6adb482..00000000000 --- a/src/gallium/state_trackers/Makefile.am +++ /dev/null @@ -1,66 +0,0 @@ -# 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"), -# 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. - -SUBDIRS = - -if HAVE_X11_DRIVER -SUBDIRS += glx/xlib -endif - -if HAVE_GALLIUM_OSMESA -SUBDIRS += osmesa -endif - -if HAVE_DRICOMMON -SUBDIRS += dri -endif - -if HAVE_GALLIUM_EGL -SUBDIRS += egl -endif - -if HAVE_GALLIUM_GBM -SUBDIRS += gbm -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 - -if HAVE_ST_OMX -SUBDIRS += omx -endif |