diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2014-01-01 13:28:07 -0800 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2014-01-01 13:52:20 -0800 |
| commit | f3fa832796a31466167e2701bb319a8d15fddd3d (patch) | |
| tree | 93ffd226f2e5a42f26d596e136af2134be0b9e7e /tests | |
| parent | 96e1c0b6e52356337ce54072517ba85b4bace852 (diff) | |
build: Move clients libexec_PROGRAMS under BUILD_CLIENTS conditional
All the libexec programs are only built when BUILD_CLIENTS is true,
so we can just assign libexec_PROGRAMS under the condition. This lets us
drop most of the variable assignments and simplify it a bit.
https://bugs.freedesktop.org/show_bug.cgi?id=72812
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 6 | ||||
| -rw-r--r-- | tests/text-test.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index baf8b7cf..d7bdcf63 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -114,7 +114,7 @@ event_weston_LDADD = libtest-client.la button_weston_SOURCES = button-test.c button_weston_LDADD = libtest-client.la -text_weston_SOURCES = text-test.c ../clients/text-protocol.c +text_weston_SOURCES = text-test.c text-protocol.c text_weston_LDADD = libtest-client.la subsurface_weston_SOURCES = subsurface-test.c @@ -154,7 +154,9 @@ EXTRA_DIST = weston-tests-env BUILT_SOURCES = \ wayland-test-protocol.c \ wayland-test-server-protocol.h \ - wayland-test-client-protocol.h + wayland-test-client-protocol.h \ + text-protocol.c \ + text-client-protocol.h CLEANFILES = $(BUILT_SOURCES) diff --git a/tests/text-test.c b/tests/text-test.c index 48f2b5a6..1f10b1bb 100644 --- a/tests/text-test.c +++ b/tests/text-test.c @@ -24,7 +24,7 @@ #include <stdio.h> #include <linux/input.h> #include "weston-test-client-helper.h" -#include "../clients/text-client-protocol.h" +#include "text-client-protocol.h" struct text_input_state { int activated; |