mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-05-05 11:48:06 +02:00
automake: compact gallium/target/Makefile into gallium/Makefile
Yet another makefile less to worry about. v2: Add state_trackers and targets on a single SUBDIRS line. Requested by Matt. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Emil Velikov
parent
eeb56b6b43
commit
7af25d17a5
4 changed files with 35 additions and 103 deletions
|
|
@ -2236,7 +2236,6 @@ AC_CONFIG_FILES([Makefile
|
|||
src/gallium/state_trackers/vega/Makefile
|
||||
src/gallium/state_trackers/xa/Makefile
|
||||
src/gallium/state_trackers/xvmc/Makefile
|
||||
src/gallium/targets/Makefile
|
||||
src/gallium/targets/dri/Makefile
|
||||
src/gallium/targets/egl-static/Makefile
|
||||
src/gallium/targets/gbm/Makefile
|
||||
|
|
|
|||
|
|
@ -50,8 +50,7 @@ endif
|
|||
if HAVE_GALLIUM
|
||||
SUBDIRS += \
|
||||
gallium/auxiliary \
|
||||
gallium \
|
||||
gallium/targets
|
||||
gallium
|
||||
|
||||
if HAVE_GALLIUM_TESTS
|
||||
SUBDIRS += \
|
||||
|
|
|
|||
|
|
@ -105,49 +105,54 @@ endif
|
|||
|
||||
|
||||
##
|
||||
## Gallium state trackers
|
||||
## Gallium state trackers and their users (targets)
|
||||
##
|
||||
|
||||
if NEED_GALLIUM_LOADER
|
||||
SUBDIRS += targets/pipe-loader
|
||||
endif
|
||||
|
||||
if HAVE_CLOVER
|
||||
SUBDIRS += state_trackers/clover
|
||||
SUBDIRS += state_trackers/clover targets/opencl
|
||||
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
|
||||
SUBDIRS += state_trackers/dri targets/dri
|
||||
endif
|
||||
|
||||
## the egl target depends on vega
|
||||
if HAVE_OPENVG
|
||||
SUBDIRS += state_trackers/vega
|
||||
endif
|
||||
|
||||
if HAVE_GALLIUM_EGL
|
||||
SUBDIRS += state_trackers/egl targets/egl-static
|
||||
endif
|
||||
|
||||
if HAVE_GALLIUM_GBM
|
||||
SUBDIRS += state_trackers/gbm targets/gbm
|
||||
endif
|
||||
|
||||
if HAVE_X11_DRIVER
|
||||
SUBDIRS += state_trackers/glx/xlib targets/libgl-xlib
|
||||
endif
|
||||
|
||||
if HAVE_ST_OMX
|
||||
SUBDIRS += state_trackers/omx targets/omx
|
||||
endif
|
||||
|
||||
if HAVE_GALLIUM_OSMESA
|
||||
SUBDIRS += state_trackers/osmesa targets/osmesa
|
||||
endif
|
||||
|
||||
if HAVE_ST_VDPAU
|
||||
SUBDIRS += state_trackers/vdpau targets/vdpau
|
||||
endif
|
||||
|
||||
if HAVE_ST_XA
|
||||
SUBDIRS += state_trackers/xa
|
||||
SUBDIRS += state_trackers/xa targets/xa
|
||||
endif
|
||||
|
||||
if HAVE_ST_XVMC
|
||||
SUBDIRS += state_trackers/xvmc
|
||||
SUBDIRS += state_trackers/xvmc targets/xvmc
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -1,71 +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_DRI2
|
||||
SUBDIRS += dri
|
||||
else
|
||||
if HAVE_DRISW
|
||||
SUBDIRS += dri
|
||||
endif
|
||||
endif
|
||||
|
||||
if HAVE_X11_DRIVER
|
||||
SUBDIRS += libgl-xlib
|
||||
endif
|
||||
|
||||
if HAVE_ST_OMX
|
||||
SUBDIRS += omx
|
||||
endif
|
||||
|
||||
if HAVE_GALLIUM_OSMESA
|
||||
SUBDIRS += osmesa
|
||||
endif
|
||||
|
||||
if HAVE_GALLIUM_GBM
|
||||
SUBDIRS += gbm
|
||||
endif
|
||||
|
||||
if HAVE_ST_VDPAU
|
||||
SUBDIRS += vdpau
|
||||
endif
|
||||
|
||||
if HAVE_ST_XA
|
||||
SUBDIRS += xa
|
||||
endif
|
||||
|
||||
if HAVE_ST_XVMC
|
||||
SUBDIRS += xvmc
|
||||
endif
|
||||
|
||||
if HAVE_CLOVER
|
||||
SUBDIRS += opencl
|
||||
endif
|
||||
|
||||
if NEED_GALLIUM_LOADER
|
||||
SUBDIRS += pipe-loader
|
||||
endif
|
||||
|
||||
if HAVE_GALLIUM_EGL
|
||||
SUBDIRS += egl-static
|
||||
endif
|
||||
Loading…
Add table
Reference in a new issue