diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2015-11-17 16:00:29 +0800 |
|---|---|---|
| committer | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2015-11-19 13:07:10 +0200 |
| commit | 3bcba347a244e1ee32a2e4f7f543a16f7a17d7e5 (patch) | |
| tree | 8755c99f1d52a7853d2e4b495d8219b3c5c1d387 /Makefile.am | |
| parent | 57e48f023c1b1fbef174b6c0c17394debc066ab1 (diff) | |
| download | weston-3bcba347a244e1ee32a2e4f7f543a16f7a17d7e5.tar.gz | |
Use text input 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 | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am index 9f7cc9df..cd6b3fc8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -117,8 +117,8 @@ nodist_weston_SOURCES = \ protocol/screenshooter-server-protocol.h \ protocol/text-cursor-position-protocol.c \ protocol/text-cursor-position-server-protocol.h \ - protocol/text-protocol.c \ - protocol/text-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/workspaces-protocol.c \ @@ -686,8 +686,8 @@ weston_editor_SOURCES = \ clients/editor.c \ shared/helpers.h nodist_weston_editor_SOURCES = \ - protocol/text-protocol.c \ - protocol/text-client-protocol.h + protocol/text-input-unstable-v1-protocol.c \ + protocol/text-input-unstable-v1-client-protocol.h weston_editor_LDADD = libtoytoolkit.la $(PANGO_LIBS) weston_editor_CFLAGS = $(AM_CFLAGS) $(CLIENT_CFLAGS) $(PANGO_CFLAGS) endif @@ -753,8 +753,8 @@ BUILT_SOURCES += \ protocol/screenshooter-client-protocol.h \ protocol/text-cursor-position-client-protocol.h \ protocol/text-cursor-position-protocol.c \ - protocol/text-protocol.c \ - protocol/text-client-protocol.h \ + 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/desktop-shell-client-protocol.h \ @@ -1212,8 +1212,8 @@ devices_weston_LDADD = libtest-client.la text_weston_SOURCES = tests/text-test.c nodist_text_weston_SOURCES = \ - protocol/text-protocol.c \ - protocol/text-client-protocol.h + protocol/text-input-unstable-v1-protocol.c \ + protocol/text-input-unstable-v1-client-protocol.h text_weston_CFLAGS = $(AM_CFLAGS) $(TEST_CLIENT_CFLAGS) text_weston_LDADD = libtest-client.la @@ -1336,13 +1336,12 @@ BUILT_SOURCES += \ protocol/weston-test-protocol.c \ protocol/weston-test-server-protocol.h \ protocol/weston-test-client-protocol.h \ - protocol/text-protocol.c \ - protocol/text-client-protocol.h + protocol/text-input-unstable-v1-protocol.c \ + protocol/text-input-unstable-v1-client-protocol.h EXTRA_DIST += \ protocol/desktop-shell.xml \ protocol/screenshooter.xml \ - protocol/text.xml \ protocol/input-method.xml \ protocol/workspaces.xml \ protocol/text-cursor-position.xml \ |