<div dir="ltr"><div>I won't claim to be an autotools expert, but this looks sane to me. Probably something we want to take care of for 1.5. </div>Reviewed-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>> </div><div class="gmail_extra"> <div class="gmail_quote">On Wed, May 7, 2014 at 7:09 AM, Thierry Reding <<a href="mailto:thierry.reding@gmail.com" target="_blank">thierry.reding@gmail.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From: Thierry Reding <<a href="mailto:treding@nvidia.com">treding@nvidia.com</a>> The wayland-server-protocol.h and wayland-client-protocol.h headers are currently being shipped in tarballs created using make dist. This causes out-of-tree builds to fail since make will detect that the headers exist by looking at the source directory (via VPATH) and not regenerate them. But as opposed to ${top_builddir}/protocol, ${top_srcdir}/protocol is not part of the include path and therefore the shipped files can't be found during compilation. Two solutions exist to this problem: 1) add ${top_srcdir}/protocol to the include path to allow shipped files to be used if available or 2) don't ship these generated files in release tarballs. The latter seems the most appropriate. wayland-scanner is already a prerequisite in order to generate wayland-protocol.c, so it is either built as part of the package or provided externally. Generating all files from the protocol definition at build time also ensures that they don't get out of sync. Both of the generated headers are already listed in Makefile.am as nodist_*_SOURCES, but at the same time they appear in include_HEADERS, which will cause them to be added to the list of distributable files after all. To prevent that, split them off into nodist_include_HEADERS. Note that this problem will be hidden if a previous version of wayland has been installed, since these files will exist in /usr/include and be included from there. So this build error will only show for out-of-tree builds on systems that don't have wayland installed yet. Signed-off-by: Thierry Reding <<a href="mailto:treding@nvidia.com">treding@nvidia.com</a>> --- Makefile.am | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index f1584d5bfc12..0ec6f47ab2c7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,13 +20,15 @@ noinst_LTLIBRARIES = <a href="http://libwayland-util.la" target="_blank">libwayland-util.la</a> include_HEADERS = \ src/wayland-util.h \ - protocol/wayland-server-protocol.h \ src/wayland-server.h \ - protocol/wayland-client-protocol.h \ src/wayland-client.h \ src/wayland-egl.h \ src/wayland-version.h +nodist_include_HEADERS = \ + protocol/wayland-server-protocol.h \ + protocol/wayland-client-protocol.h + libwayland_util_la_SOURCES = \ src/connection.c \ src/wayland-util.c \ -- 1.9.2 _______________________________________________ wayland-devel mailing list <a href="mailto:wayland-devel@lists.freedesktop.org">wayland-devel@lists.freedesktop.org</a> <a href="http://lists.freedesktop.org/mailman/listinfo/wayland-devel" target="_blank">http://lists.freedesktop.org/mailman/listinfo/wayland-devel</a> </blockquote></div> </div>