[Mesa-dev] [PATCH v2 1/7] waylan-drm: do not distribute generated sources

[Juan A. Suarez Romero]

Instead we will re-generate them again on building.
---
 src/egl/Makefile.am                     | 10 +++++++++-
 src/egl/wayland/wayland-drm/Makefile.am |  8 ++++++--
 src/vulkan/Makefile.am                  | 11 +++++++++--
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
index 285d3caa9ef..3bfce3313db 100644
--- a/src/egl/Makefile.am
+++ b/src/egl/Makefile.am
@@ -50,6 +50,7 @@ libEGL_common_la_LIBADD = \
 	$(EGL_LIB_DEPS)
 
 dri2_backend_FILES =
+dri2_backend_GENERATED_FILES =
 dri3_backend_FILES =
 
 if HAVE_PLATFORM_X11
@@ -87,7 +88,8 @@ AM_CFLAGS += $(WAYLAND_SERVER_CFLAGS)
 libEGL_common_la_LIBADD += $(top_builddir)/src/egl/wayland/wayland-drm/libwayland-drm.la
 libEGL_common_la_LIBADD += $(WAYLAND_SERVER_LIBS)
 dri2_backend_FILES += \
-	drivers/dri2/platform_wayland.c	\
+	drivers/dri2/platform_wayland.c
+dri2_backend_GENERATED_FILES += \
 	drivers/dri2/linux-dmabuf-unstable-v1-protocol.c \
 	drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h
 endif
@@ -118,6 +120,12 @@ AM_CFLAGS += \
 	-DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_SEARCH_DIR)\" \
 	-D_EGL_BUILT_IN_DRIVER_DRI2
 
+BUILT_SOURCES += \
+	$(dri2_backend_GENERATED_FILES)
+
+nodist_libEGL_common_la_SOURCES = \
+	$(dri2_backend_GENERATED_FILES)
+
 libEGL_common_la_SOURCES += \
 	$(dri2_backend_core_FILES) \
 	$(dri2_backend_FILES) \
diff --git a/src/egl/wayland/wayland-drm/Makefile.am b/src/egl/wayland/wayland-drm/Makefile.am
index c10c4349d48..684b389a025 100644
--- a/src/egl/wayland/wayland-drm/Makefile.am
+++ b/src/egl/wayland/wayland-drm/Makefile.am
@@ -4,10 +4,14 @@ AM_CFLAGS = -I$(top_srcdir)/include \
 	    $(WAYLAND_SERVER_CFLAGS)
 
 noinst_LTLIBRARIES = libwayland-drm.la
+
+nodist_libwayland_drm_la_SOURCES =\
+	wayland-drm-protocol.c
+
 libwayland_drm_la_SOURCES = \
 	wayland-drm.c \
-	wayland-drm.h \
-	wayland-drm-protocol.c
+	wayland-drm.h
+
 noinst_HEADERS = wayland-drm.h
 
 EXTRA_DIST = wayland-drm.xml meson.build
diff --git a/src/vulkan/Makefile.am b/src/vulkan/Makefile.am
index e6d4277f92f..fdfd8a5d42a 100644
--- a/src/vulkan/Makefile.am
+++ b/src/vulkan/Makefile.am
@@ -21,7 +21,8 @@ VULKAN_UTIL_SOURCES = \
 	$(VULKAN_UTIL_GENERATED_FILES)
 
 BUILT_SOURCES = \
-	$(VULKAN_UTIL_GENERATED_FILES)
+	$(VULKAN_UTIL_GENERATED_FILES) \
+	$(VULKAN_WSI_WAYLAND_GENERATED_FILES)
 
 util/vk_enum_to_str.c util/vk_enum_to_str.h: util/gen_enum_to_str.py \
 		$(vulkan_api_xml) $(vk_android_native_buffer_xml)
@@ -46,6 +47,8 @@ AM_CFLAGS = \
 	$(LIBDRM_CFLAGS) \
 	$(VISIBILITY_CFLAGS)
 
+VULKAN_WSI_GENERATED_SOURCES =
+
 VULKAN_WSI_SOURCES = \
 	$(VULKAN_WSI_FILES)
 
@@ -91,9 +94,13 @@ AM_CPPFLAGS += \
 	-DVK_USE_PLATFORM_WAYLAND_KHR
 
 VULKAN_WSI_SOURCES += \
-	$(VULKAN_WSI_WAYLAND_FILES) \
+	$(VULKAN_WSI_WAYLAND_FILES)
+
+VULKAN_WSI_GENERATED_SOURCES += \
 	$(VULKAN_WSI_WAYLAND_GENERATED_FILES)
 
 endif
 
+nodist_libvulkan_wsi_la_SOURCES = $(VULKAN_WSI_GENERATED_SOURCES)
+
 libvulkan_wsi_la_SOURCES = $(VULKAN_WSI_SOURCES)
-- 
2.14.3