diff options
| author | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2013-11-15 16:12:13 +0200 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2013-11-15 16:23:17 -0800 |
| commit | a662206e711cce852871929d29b4ca82fd9e0efe (patch) | |
| tree | 30a2a0476e46996a31567ba40ee81aa92c53267f /tests | |
| parent | ba44c6bf2e266e197818f3dbeabde0e6bc11fd81 (diff) | |
protocol: move sub-surfaces to Wayland
This reverts commit 2396aec6842c709a714f3825dbad9fd88478f2e6.
This exact version of the sub-surface protocol has been copied into
Wayland core. Therefore it must be removed from here to avoid build
conflicts and useless duplication.
No other changes to sub-surface protocol consumers are needed, the
identical API is now offered by libwayland-client and libwayland-server.
The commit adding sub-surfaces to Wayland is:
Author: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
protocol: add sub-surfaces to the core
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/.gitignore | 2 | ||||
| -rw-r--r-- | tests/Makefile.am | 6 | ||||
| -rw-r--r-- | tests/subsurface-test.c | 1 |
3 files changed, 1 insertions, 8 deletions
diff --git a/tests/.gitignore b/tests/.gitignore index aba378c3..fbeeed9e 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -9,5 +9,3 @@ test-text-client wayland-test-client-protocol.h wayland-test-protocol.c wayland-test-server-protocol.h -subsurface-client-protocol.h -subsurface-protocol.c diff --git a/tests/Makefile.am b/tests/Makefile.am index 5be52c6e..8e08375f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -91,9 +91,7 @@ weston_test_client_src = \ weston-test-client-helper.c \ weston-test-client-helper.h \ wayland-test-protocol.c \ - wayland-test-client-protocol.h \ - subsurface-protocol.c \ - subsurface-client-protocol.h + wayland-test-client-protocol.h weston_test_client_libs = \ $(SIMPLE_CLIENT_LIBS) \ ../shared/libshared.la \ @@ -146,8 +144,6 @@ endif EXTRA_DIST = weston-tests-env BUILT_SOURCES = \ - subsurface-protocol.c \ - subsurface-client-protocol.h \ wayland-test-protocol.c \ wayland-test-server-protocol.h \ wayland-test-client-protocol.h diff --git a/tests/subsurface-test.c b/tests/subsurface-test.c index 98e00fea..1c2641b6 100644 --- a/tests/subsurface-test.c +++ b/tests/subsurface-test.c @@ -23,7 +23,6 @@ #include <string.h> #include "weston-test-client-helper.h" -#include "subsurface-client-protocol.h" #include <stdio.h> #define NUM_SUBSURFACES 3 |