diff options
| author | Emil Velikov <[email protected]> | 2017-07-20 17:53:01 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-07-24 10:23:41 +0100 |
| commit | 166852ee957ff25a1d14dcaa7512917343130fa4 (patch) | |
| tree | 38164309bc370eeb4657caa266d3fa7ebf29870a /src | |
| parent | feef47bb593306aee2854e9bd146543c44d68468 (diff) | |
configure.ac: rework wayland-protocols handling
At dist/distcheck time we need to ensure that all the files and their
respective dependencies are handled.
At the moment we'll bail out as the linux-dmabuf rules are guarded in a
conditional. Move them outside of it and drop the sources from
BUILT_SOURCES.
Thus the files will be generated only as needed, which will happen only
after the wayland-protocols dependency is enforced in configure.ac.
v2: add dependency tracking for the header
Cc: Andres Gomez <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Andres Gomez <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/egl/Makefile.am | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am index 7c1a4929b81..f881145c0e3 100644 --- a/src/egl/Makefile.am +++ b/src/egl/Makefile.am @@ -64,7 +64,6 @@ libEGL_common_la_LIBADD += $(top_builddir)/src/loader/libloader_dri3_helper.la endif endif -if HAVE_PLATFORM_WAYLAND WL_DMABUF_XML = $(WAYLAND_PROTOCOLS_DATADIR)/unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml drivers/dri2/linux-dmabuf-unstable-v1-protocol.c: $(WL_DMABUF_XML) @@ -75,17 +74,19 @@ drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h: $(WL_DMABUF_XML) $(MKDIR_GEN) $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@ -BUILT_SOURCES += \ - drivers/dri2/linux-dmabuf-unstable-v1-protocol.c \ - drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h +drivers/dri2/linux-dmabuf-unstable-v1-protocol.lo: drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h +drivers/dri2/egl_dri2.lo: drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h +if HAVE_PLATFORM_WAYLAND AM_CFLAGS += $(WAYLAND_CFLAGS) libEGL_common_la_LIBADD += $(WAYLAND_LIBS) libEGL_common_la_LIBADD += $(LIBDRM_LIBS) libEGL_common_la_LIBADD += $(top_builddir)/src/egl/wayland/wayland-drm/libwayland-drm.la libEGL_common_la_LIBADD += $(top_builddir)/src/util/libmesautil.la -dri2_backend_FILES += drivers/dri2/platform_wayland.c \ - drivers/dri2/linux-dmabuf-unstable-v1-protocol.c +dri2_backend_FILES += \ + drivers/dri2/platform_wayland.c \ + drivers/dri2/linux-dmabuf-unstable-v1-protocol.c \ + drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h endif if HAVE_PLATFORM_DRM |