KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland-drm: do not distribute generated sources 

Instead we will re-generate them again on building.

v2: get rid of BUILT_SOURCES (Daniel, Emil)
v3: keep BUILT_SOURCES for egl/Makefile.am (Emil)

Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Juan A. Suarez Romero 2018-03-23 11:24:42 +01:00
parent ccc64f3133
commit ee2b943fa8
3 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/egl/Makefile.am
View File

@ -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,9 @@ AM_CFLAGS += \
-DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_SEARCH_DIR)\" \
-D_EGL_BUILT_IN_DRIVER_DRI2
nodist_libEGL_common_la_SOURCES = \
$(dri2_backend_GENERATED_FILES)
libEGL_common_la_SOURCES += \
$(dri2_backend_core_FILES) \
$(dri2_backend_FILES) \
@ -148,7 +153,10 @@ g_egldispatchstubs.h: $(GLVND_GEN_DEPS)
$(top_srcdir)/src/egl/generate/egl_other.xml > $@
BUILT_SOURCES += g_egldispatchstubs.c g_egldispatchstubs.h
CLEANFILES = $(BUILT_SOURCES)
CLEANFILES = \
$(BUILT_SOURCES) \
$(dri2_backend_GENERATED_FILES)
if USE_LIBGLVND
AM_CFLAGS += \

22
src/egl/wayland/wayland-drm/Makefile.am
View File

@ -3,19 +3,29 @@ AM_CFLAGS = -I$(top_srcdir)/include \
$(VISIBILITY_CFLAGS) \
$(WAYLAND_SERVER_CFLAGS)
if HAVE_PLATFORM_WAYLAND
wayland-drm.lo: wayland-drm-client-protocol.h wayland-drm-server-protocol.h
endif
noinst_LTLIBRARIES = libwayland-drm.la
nodist_libwayland_drm_la_SOURCES = \
wayland-drm-protocol.c \
wayland-drm-client-protocol.h \
wayland-drm-server-protocol.h
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
BUILT_SOURCES = wayland-drm-protocol.c \
wayland-drm-client-protocol.h \
wayland-drm-server-protocol.h
CLEANFILES = $(BUILT_SOURCES)
CLEANFILES = \
wayland-drm-protocol.c \
wayland-drm-client-protocol.h \
wayland-drm-server-protocol.h
%-protocol.c : %.xml
$(AM_V_GEN)$(WAYLAND_SCANNER) code $< $@

15
src/vulkan/Makefile.am
View File

@ -20,9 +20,6 @@ VULKAN_UTIL_SOURCES = \
$(VULKAN_UTIL_FILES) \
$(VULKAN_UTIL_GENERATED_FILES)
BUILT_SOURCES = \
$(VULKAN_UTIL_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)
$(MKDIR_GEN)
@ -46,6 +43,8 @@ AM_CFLAGS = \
$(LIBDRM_CFLAGS) \
$(VISIBILITY_CFLAGS)
VULKAN_WSI_GENERATED_SOURCES =
VULKAN_WSI_SOURCES = \
$(VULKAN_WSI_FILES)
@ -58,7 +57,9 @@ AM_CPPFLAGS += \
VULKAN_WSI_SOURCES += $(VULKAN_WSI_X11_FILES)
endif
CLEANFILES = $(BUILT_SOURCES)
CLEANFILES = \
$(VULKAN_UTIL_GENERATED_FILES) \
$(VULKAN_WSI_WAYLAND_GENERATED_FILES)
WL_DRM_XML = $(top_srcdir)/src/egl/wayland/wayland-drm/wayland-drm.xml
@ -91,9 +92,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)