Mesa (master): meson: move wayland_drm_protocol generation to wayland-drm

[Dylan Baker]

Module: Mesa
Branch: master
Commit: ddf06a05ad32118854136f9ad0bc2a38f41e6430
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ddf06a05ad32118854136f9ad0bc2a38f41e6430

Author: Dylan Baker <dylan at pnwbakers.com>
Date:   Tue Oct 17 15:02:58 2017 -0700

meson: move wayland_drm_protocol generation to wayland-drm

These files are needed by both vulkan wayland-wsi and by egl
wayland-wsi, since the XML file is in src/egl/wayland/wayland-drm and we
can include this directory in such a way that it will be loaded before
egl and vulkan this allows us to avoid multiple calls to the same
generator.

Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
Reviewed-and-Tested-by: Eric Engestrom <eric at engestrom.ch>

---

 src/egl/wayland/wayland-drm/meson.build | 14 +++++++++++++-
 src/vulkan/wsi/meson.build              | 14 --------------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/egl/wayland/wayland-drm/meson.build b/src/egl/wayland/wayland-drm/meson.build
index 0a94626f28..92adc29553 100644
--- a/src/egl/wayland/wayland-drm/meson.build
+++ b/src/egl/wayland/wayland-drm/meson.build
@@ -18,4 +18,16 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-wayland_drm_xml = files('wayland-drm.xml')
+wayland_drm_protocol_c = custom_target(
+  'wayland-drm-protocol.c',
+  input : 'wayland-drm.xml',
+  output : 'wayland-drm-protocol.c',
+  command : [prog_wl_scanner, 'code', '@INPUT@', '@OUTPUT@'],
+)
+
+wayland_drm_client_protocol_h = custom_target(
+  'wayland-drm-client-protocol.h',
+  input : 'wayland-drm.xml',
+  output : 'wayland-drm-client-protocol.h',
+  command : [prog_wl_scanner, 'client-header', '@INPUT@', '@OUTPUT@'],
+)
diff --git a/src/vulkan/wsi/meson.build b/src/vulkan/wsi/meson.build
index c42af8e4cd..3aa02d5e63 100644
--- a/src/vulkan/wsi/meson.build
+++ b/src/vulkan/wsi/meson.build
@@ -18,20 +18,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-wayland_drm_protocol_c = custom_target(
-  'wayland-drm-protocol.c',
-  input : wayland_drm_xml,
-  output : 'wayland-drm-protocol.c',
-  command : [prog_wl_scanner, 'code', '@INPUT@', '@OUTPUT@'],
-)
-
-wayland_drm_client_protocol_h = custom_target(
-  'wayland-drm-client-protocol.h',
-  input : wayland_drm_xml,
-  output : 'wayland-drm-client-protocol.h',
-  command : [prog_wl_scanner, 'client-header', '@INPUT@', '@OUTPUT@'],
-)
-
 vulkan_wsi_args = []
 vulkan_wsi_deps = []