From 7af25d17a5956106c5319ba8cd7d947fbab76f6b Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Sun, 20 Jul 2014 23:12:08 +0100 Subject: [PATCH] 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 Reviewed-by: Matt Turner --- configure.ac | 1 - src/Makefile.am | 3 +- src/gallium/Makefile.am | 35 +++++++++------- src/gallium/targets/Makefile.am | 71 --------------------------------- 4 files changed, 21 insertions(+), 89 deletions(-) delete mode 100644 src/gallium/targets/Makefile.am diff --git a/configure.ac b/configure.ac index 4f7b1f3ae1c..9aeebdf148e 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/src/Makefile.am b/src/Makefile.am index 4193fe82ae4..7da91a25443 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -50,8 +50,7 @@ endif if HAVE_GALLIUM SUBDIRS += \ gallium/auxiliary \ - gallium \ - gallium/targets + gallium if HAVE_GALLIUM_TESTS SUBDIRS += \ diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am index ceb38b7943c..d35e117578c 100644 --- a/src/gallium/Makefile.am +++ b/src/gallium/Makefile.am @@ -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 +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 +SUBDIRS += state_trackers/egl targets/egl-static endif if HAVE_GALLIUM_GBM -SUBDIRS += state_trackers/gbm +SUBDIRS += state_trackers/gbm targets/gbm endif if HAVE_X11_DRIVER -SUBDIRS += state_trackers/glx/xlib +SUBDIRS += state_trackers/glx/xlib targets/libgl-xlib endif if HAVE_ST_OMX -SUBDIRS += state_trackers/omx +SUBDIRS += state_trackers/omx targets/omx endif if HAVE_GALLIUM_OSMESA -SUBDIRS += state_trackers/osmesa +SUBDIRS += state_trackers/osmesa targets/osmesa endif if HAVE_ST_VDPAU -SUBDIRS += state_trackers/vdpau -endif - -if HAVE_OPENVG -SUBDIRS += state_trackers/vega +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 diff --git a/src/gallium/targets/Makefile.am b/src/gallium/targets/Makefile.am deleted file mode 100644 index 3cacb040a7a..00000000000 --- a/src/gallium/targets/Makefile.am +++ /dev/null @@ -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 -- 2.30.2