From aeee701b63747d240d8c4bf113ed152e05396f67 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 3 Nov 2017 14:01:40 -0400 Subject: [PATCH] fix undefined symbols on autotools+wayland build --- configure.ac | 2 +- src/bin/Makefile.mk | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 93eafa770..486d69384 100644 --- a/configure.ac +++ b/configure.ac @@ -682,7 +682,7 @@ AC_SUBST([SOUND_CFLAGS]) AC_SUBST([SOUND_LIBS]) if test "x${e_cv_want_wayland_only}" != "xno" ;then - PKG_CHECK_MODULES([WAYLAND], [ecore-wl2 >= 1.18 wayland-server >= 1.11.0 wayland-client >= 1.11.0 wayland-protocols >= 1.9 wayland-scanner >= 1.11.0 xkbcommon uuid], + PKG_CHECK_MODULES([WAYLAND], [ecore-wl2 >= 1.18 wayland-server >= 1.11.0 wayland-client >= 1.11.0 wayland-protocols >= 1.9 wayland-scanner >= 1.11.0 xkbcommon uuid efl-wl], [ have_wayland=yes have_wayland_dep=true diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk index cc558ed2d..a3ea11ed5 100644 --- a/src/bin/Makefile.mk +++ b/src/bin/Makefile.mk @@ -2,7 +2,6 @@ DISTCLEANFILES += src/bin/e_fm_shared_types.h EXTRA_DIST += \ src/bin/e_drm2.x \ -src/bin/e_gadget_runner.c \ src/bin/e_gadget_loader.c efx_files = \ @@ -438,7 +437,8 @@ src/bin/e_comp_wl_input.c \ src/bin/e_comp_wl_dmabuf.c \ src/bin/e_comp_wl.c \ src/bin/e_comp_wl_extensions.c \ -src/bin/e_comp_wl_extensions_tizen.c +src/bin/e_comp_wl_extensions_tizen.c \ +src/bin/e_gadget_runner.c enlightenment_gen_src += \ src/bin/generated/linux-dmabuf-unstable-v1-server-protocol.h \ @@ -456,7 +456,9 @@ src/bin/generated/relative-pointer-unstable-v1-server-protocol.h \ src/bin/generated/pointer-constraints-unstable-v1-protocol.c \ src/bin/generated/pointer-constraints-unstable-v1-server-protocol.h \ src/bin/generated/efl-aux-hints-protocol.c \ -src/bin/generated/efl-aux-hints-server-protocol.h +src/bin/generated/efl-aux-hints-server-protocol.h \ +src/bin/generated/e-gadget-protocol.c \ +src/bin/generated/e-gadget-server-protocol.h src/bin/e_comp_wl_extensions.c: \ $(enlightenment_gen_src)