diff options
| author | Derek Foreman <derekf@osg.samsung.com> | 2018-02-28 13:33:32 -0600 |
|---|---|---|
| committer | Derek Foreman <derekf@osg.samsung.com> | 2018-02-28 13:35:10 -0600 |
| commit | 976b0d24cc072c359cf9e583944b31f8e6448c98 (patch) | |
| tree | 2deed46deff57581ad94539b0e29fe561f18891f | |
| parent | d176a37f32b47208aea57bb7fdf9934c4287d25a (diff) | |
| download | efl-976b0d24cc072c359cf9e583944b31f8e6448c98.tar.gz | |
Revert "wayland_imf: Fix bug in shutdown"
This reverts commit fb01a697dd099f17a6a30c74781b6cfeb72bc512.
The problem this commit was anticipating never happened.
Now the next version of wayland will allow us to make protocol symbols
private, so it makes more sense to have this stuff back where it was
in the first place.
| -rw-r--r-- | src/Makefile_Ecore_IMF.am | 8 | ||||
| -rw-r--r-- | src/Makefile_Ecore_Wl2.am | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/Makefile_Ecore_IMF.am b/src/Makefile_Ecore_IMF.am index 3c2355f218..c43f2a82c1 100644 --- a/src/Makefile_Ecore_IMF.am +++ b/src/Makefile_Ecore_IMF.am @@ -138,6 +138,14 @@ modules/ecore_imf/wayland/wayland_module.c \ modules/ecore_imf/wayland/wayland_imcontext.c \ modules/ecore_imf/wayland/wayland_imcontext.h +nodist_modules_ecore_imf_wayland_module_la_SOURCES = \ +modules/ecore_imf/wayland/text-input-unstable-v1-client-protocol.h \ +modules/ecore_imf/wayland/text-input-unstable-v1-protocol.c + +BUILT_SOURCES += \ +modules/ecore_imf/wayland/text-input-unstable-v1-client-protocol.h \ +modules/ecore_imf/wayland/text-input-unstable-v1-protocol.c + modules_ecore_imf_wayland_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ -I$(top_builddir)/src/modules/ecore_imf/wayland \ @ECORE_IMF_CFLAGS@ \ diff --git a/src/Makefile_Ecore_Wl2.am b/src/Makefile_Ecore_Wl2.am index 29838fcbac..5daa85a5f0 100644 --- a/src/Makefile_Ecore_Wl2.am +++ b/src/Makefile_Ecore_Wl2.am @@ -44,8 +44,6 @@ lib/ecore_wl2/xdg-shell-client-protocol.h \ lib/ecore_wl2/xdg-shell-protocol.c \ lib/ecore_wl2/xdg-shell-unstable-v6-client-protocol.h \ lib/ecore_wl2/xdg-shell-unstable-v6-protocol.c \ -lib/ecore_wl2/text-input-unstable-v1-client-protocol.h \ -lib/ecore_wl2/text-input-unstable-v1-protocol.c \ lib/ecore_wl2/efl-hints-client-protocol.h \ lib/ecore_wl2/efl-hints-protocol.c @@ -73,8 +71,6 @@ lib/ecore_wl2/efl-aux-hints-client-protocol.h \ lib/ecore_wl2/linux-dmabuf-unstable-v1-client-protocol.h \ lib/ecore_wl2/session-recovery-protocol.c \ lib/ecore_wl2/session-recovery-client-protocol.h \ - lib/ecore_wl2/text-input-unstable-v1-client-protocol.h \ - lib/ecore_wl2/text-input-unstable-v1-protocol.c \ lib/ecore_wl2/efl-hints-client-protocol.h \ lib/ecore_wl2/efl-hints-protocol.c |