diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2015-11-17 16:00:30 +0800 |
|---|---|---|
| committer | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2015-11-19 13:17:59 +0200 |
| commit | b57f472c84592b0ec64c39d2e707892e58587aea (patch) | |
| tree | 2fe423cd0a945fd2c6a4174c2169747525e2d8c6 /Makefile.am | |
| parent | 3bcba347a244e1ee32a2e4f7f543a16f7a17d7e5 (diff) | |
| download | weston-b57f472c84592b0ec64c39d2e707892e58587aea.tar.gz | |
Use input method protocol from wayland-protocols
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Reviewed-by: Mariusz Ceier <mceier+wayland@gmail.com>
Reviewed-by: Jan Arne Petersen <janarne@gmail.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index cd6b3fc8..4c705593 100644 --- a/Makefile.am +++ b/Makefile.am @@ -119,8 +119,8 @@ nodist_weston_SOURCES = \ protocol/text-cursor-position-server-protocol.h \ protocol/text-input-unstable-v1-protocol.c \ protocol/text-input-unstable-v1-server-protocol.h \ - protocol/input-method-protocol.c \ - protocol/input-method-server-protocol.h \ + protocol/input-method-unstable-v1-protocol.c \ + protocol/input-method-unstable-v1-server-protocol.h \ protocol/workspaces-protocol.c \ protocol/workspaces-server-protocol.h \ protocol/presentation_timing-protocol.c \ @@ -696,15 +696,15 @@ weston_keyboard_SOURCES = clients/keyboard.c nodist_weston_keyboard_SOURCES = \ protocol/desktop-shell-client-protocol.h \ protocol/desktop-shell-protocol.c \ - protocol/input-method-protocol.c \ - protocol/input-method-client-protocol.h + protocol/input-method-unstable-v1-protocol.c \ + protocol/input-method-unstable-v1-client-protocol.h weston_keyboard_LDADD = libtoytoolkit.la weston_keyboard_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS) weston_simple_im_SOURCES = clients/weston-simple-im.c nodist_weston_simple_im_SOURCES = \ - protocol/input-method-protocol.c \ - protocol/input-method-client-protocol.h + protocol/input-method-unstable-v1-protocol.c \ + protocol/input-method-unstable-v1-client-protocol.h weston_simple_im_LDADD = $(CLIENT_LIBS) weston_simple_im_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS) @@ -755,8 +755,8 @@ BUILT_SOURCES += \ protocol/text-cursor-position-protocol.c \ protocol/text-input-unstable-v1-protocol.c \ protocol/text-input-unstable-v1-client-protocol.h \ - protocol/input-method-protocol.c \ - protocol/input-method-client-protocol.h \ + protocol/input-method-unstable-v1-protocol.c \ + protocol/input-method-unstable-v1-client-protocol.h \ protocol/desktop-shell-client-protocol.h \ protocol/desktop-shell-protocol.c \ protocol/scaler-client-protocol.h \ @@ -1342,7 +1342,6 @@ BUILT_SOURCES += \ EXTRA_DIST += \ protocol/desktop-shell.xml \ protocol/screenshooter.xml \ - protocol/input-method.xml \ protocol/workspaces.xml \ protocol/text-cursor-position.xml \ protocol/weston-test.xml \ |