stefan pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=44b36e6697ce3fcde71e909867c7c02851653b04
commit 44b36e6697ce3fcde71e909867c7c02851653b04 Author: Stefan Schmidt <[email protected]> Date: Wed Jul 12 18:56:47 2017 +0200 build: efl_wl: make sure we have the two files for efl_wl included These two files coming in via EXTRA_DIST have not been included becuase they have been living inside an ifdef which would only have them included in a dist when configured with wayland enabled. We always want to have these files in the dist though. Building for wayland out of a tarball release works now again. Problem reported by William L. Thomson Jr. --- src/Makefile.am | 2 +- src/Makefile_efl_wl.am | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 10eba0771e..b3cced6e3d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -175,7 +175,7 @@ dist-hook: @mkdir -p $(distdir)/lib/evas/common/evas_op_mask $(distdir)/lib/evas/common/evas_op_mul @mkdir -p $(distdir)/lib/evas/common/evas_op_sub $(distdir)/lib/evas/filters/blur @mkdir -p $(distdir)/static_libs/http-parser/contrib $(distdir)/bindings/luajit/eina - @mkdir -p $(distdir)/wayland_protocol + @mkdir -p $(distdir)/wayland_protocol $(distdir)/lib/efl_wl/ @mkdir -p $(distdir)/modules/evas/engines/software_generic/filters/blur for F in $(EXTRA_DIST2); do cp -f $(srcdir)/$$F $(distdir)/$$F; done diff --git a/src/Makefile_efl_wl.am b/src/Makefile_efl_wl.am index 270c99fc0a..aae58ff780 100644 --- a/src/Makefile_efl_wl.am +++ b/src/Makefile_efl_wl.am @@ -46,8 +46,8 @@ bin_efl_wl_efl_wl_test_stack_CPPFLAGS = \ @EFL_WL_CFLAGS@ \ @ELEMENTARY_CFLAGS@ +endif + EXTRA_DIST2 += \ lib/efl_wl/copiedfromweston.x \ lib/efl_wl/x11.x - -endif --
