From: Stefan Schmidt <stefan@osg.samsung.com>
Date: Wed, 12 Jul 2017 16:56:47 +0000 (+0200)
Subject: build: efl_wl: make sure we have the two files  for efl_wl included
X-Git-Tag: upstream/1.20.0~266
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=44b36e6697ce3fcde71e909867c7c02851653b04;p=platform%2Fupstream%2Fefl.git

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.
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 10eba07..b3cced6 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 270c99f..aae58ff 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