diff options
| author | Juan A. Suarez Romero <[email protected]> | 2018-03-23 11:24:42 +0100 |
|---|---|---|
| committer | Juan A. Suarez Romero <[email protected]> | 2018-03-23 11:27:12 +0100 |
| commit | ee2b943fa85755fe2565f12c625e41cd08a826f9 (patch) | |
| tree | dd04c57a2ed8e332ea2d1d355deef44b08405037 /src/egl | |
| parent | ccc64f313398fbfa025db9a09b9d980ac0ff7415 (diff) | |
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 <[email protected]>
Diffstat (limited to 'src/egl')
| -rw-r--r-- | src/egl/Makefile.am | 12 | ||||
| -rw-r--r-- | src/egl/wayland/wayland-drm/Makefile.am | 22 |
2 files changed, 26 insertions, 8 deletions
diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am index 285d3caa9ef..086a4a1e630 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,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 += \ diff --git a/src/egl/wayland/wayland-drm/Makefile.am b/src/egl/wayland/wayland-drm/Makefile.am index c10c4349d48..0404c79e7fa 100644 --- a/src/egl/wayland/wayland-drm/Makefile.am +++ b/src/egl/wayland/wayland-drm/Makefile.am @@ -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 $< $@ |