diff options
-rw-r--r-- | configure.ac | 9 | ||||
-rw-r--r-- | src/Makefile_Ecore_Wayland.am | 2 |
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 | ||
1008 | if test "${want_wayland}" = "yes"; then | 1008 | if test "${want_wayland}" = "yes"; then |
1009 | EFL_PKG_CHECK_STRICT([wayland-client]) | 1009 | EFL_PKG_CHECK_STRICT([wayland-client]) |
1010 | dnl 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")]) |
1011 | dnl magically... you cant do dev on efl. configure is totally broken. | ||
1012 | dnl you end up with something like: | ||
1013 | dnl | ||
1014 | dnl ./configure: line 25508: syntax error near unexpected token `'$(top_srcdir)/data/ecore/ecore_wayland/protocol'' | ||
1015 | dnl ./configure: line 25508: `WAYLAND_SCANNER_RULES('$(top_srcdir)/data/ecore/ecore_wayland/protocol')' | ||
1016 | |||
1017 | dnl WAYLAND_SCANNER_RULES(['$(top_srcdir)/data/ecore/ecore_wayland/protocol']) | ||
1018 | fi | 1011 | fi |
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@ | |||
31 | lib_ecore_wayland_libecore_wayland_la_DEPENDENCIES = @ECORE_WAYLAND_INTERNAL_LIBS@ | 31 | lib_ecore_wayland_libecore_wayland_la_DEPENDENCIES = @ECORE_WAYLAND_INTERNAL_LIBS@ |
32 | lib_ecore_wayland_libecore_wayland_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ | 32 | lib_ecore_wayland_libecore_wayland_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ |
33 | 33 | ||
34 | wayland_protocoldir = $(top_srcdir)/data/ecore/ecore_wayland/protocol | ||
35 | |||
34 | lib/ecore_wayland/subsurface-protocol.c: $(wayland_protocoldir)/subsurface.xml | 36 | lib/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 | ||