summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorU. Artie Eoff <ullysses.a.eoff@intel.com>2013-10-05 08:53:35 -0700
committerRafael Antognolli <rafael.antognolli@intel.com>2013-10-10 13:24:17 -0300
commitd201747cc8b0f74035c8069461c7df5704719bfe (patch)
treedd760ae03b6f374413fb635562c8b19f591915fc
parent82e1fef6ed43dd511af3a502a0ba8f0207202987 (diff)
ecore/wayland: detect wayland-scanner
We need the wayland-scanner program to auto-generate the subsurface protocol source files from subsurface.xml Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com>
-rw-r--r--configure.ac9
-rw-r--r--src/Makefile_Ecore_Wayland.am2
2 files changed, 3 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac
index d72031044c..e9efd1fb99 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1007,14 +1007,7 @@ AC_ARG_ENABLE([wayland],
1007 1007
1008if test "${want_wayland}" = "yes"; then 1008if test "${want_wayland}" = "yes"; then
1009 EFL_PKG_CHECK_STRICT([wayland-client]) 1009 EFL_PKG_CHECK_STRICT([wayland-client])
1010dnl This is a problem. unless you somehow have this macro defined 1010 AC_PATH_PROG([wayland_scanner], [wayland-scanner], [AC_MSG_ERROR("wayland-scanner is needed to compile ecore_wayland protocol")])
1011dnl magically... you cant do dev on efl. configure is totally broken.
1012dnl you end up with something like:
1013dnl
1014dnl ./configure: line 25508: syntax error near unexpected token `'$(top_srcdir)/data/ecore/ecore_wayland/protocol''
1015dnl ./configure: line 25508: `WAYLAND_SCANNER_RULES('$(top_srcdir)/data/ecore/ecore_wayland/protocol')'
1016
1017dnl WAYLAND_SCANNER_RULES(['$(top_srcdir)/data/ecore/ecore_wayland/protocol'])
1018fi 1011fi
1019 1012
1020# Fb 1013# Fb
diff --git a/src/Makefile_Ecore_Wayland.am b/src/Makefile_Ecore_Wayland.am
index 0709d6b545..607d26e032 100644
--- a/src/Makefile_Ecore_Wayland.am
+++ b/src/Makefile_Ecore_Wayland.am
@@ -31,6 +31,8 @@ lib_ecore_wayland_libecore_wayland_la_LIBADD = @ECORE_WAYLAND_LIBS@
31lib_ecore_wayland_libecore_wayland_la_DEPENDENCIES = @ECORE_WAYLAND_INTERNAL_LIBS@ 31lib_ecore_wayland_libecore_wayland_la_DEPENDENCIES = @ECORE_WAYLAND_INTERNAL_LIBS@
32lib_ecore_wayland_libecore_wayland_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 32lib_ecore_wayland_libecore_wayland_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
33 33
34wayland_protocoldir = $(top_srcdir)/data/ecore/ecore_wayland/protocol
35
34lib/ecore_wayland/subsurface-protocol.c: $(wayland_protocoldir)/subsurface.xml 36lib/ecore_wayland/subsurface-protocol.c: $(wayland_protocoldir)/subsurface.xml
35 $(AM_V_GEN)$(wayland_scanner) code < $< > $@ 37 $(AM_V_GEN)$(wayland_scanner) code < $< > $@
36 38