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

diff --git a/clients/Makefile.am b/clients/Makefile.am
index 4f338f2..c85991b 100644 (file)
--- a/clients/Makefile.am
+++ b/clients/Makefile.am
@@ -13,13 +13,6 @@ else
 noinst_PROGRAMS = $(demo_clients)
 endif
 
-libexec_PROGRAMS =                             \
-       $(desktop_shell)                        \
-       $(screenshooter)                        \
-       $(screensaver)                          \
-       $(keyboard)                             \
-       weston-simple-im
-
 AM_CFLAGS = $(GCC_CFLAGS)
 AM_CPPFLAGS =                                  \
        -DDATADIR='"$(datadir)"'                \
@@ -63,6 +56,13 @@ endif
 if BUILD_CLIENTS
 install_clients = weston-terminal weston-info
 
+libexec_PROGRAMS =                             \
+       weston-desktop-shell
+       weston-screenshooter                    \
+       $(screensaver)                          \
+       weston-keyboard                         \
+       weston-simple-im
+
 clients_programs =                             \
        weston-flower                           \
        weston-image                            \
@@ -81,10 +81,6 @@ clients_programs =                           \
        $(full_gl_client_programs)              \
        $(cairo_glesv2_programs)
 
-desktop_shell = weston-desktop-shell
-
-screenshooter = weston-screenshooter
-
 noinst_LTLIBRARIES = libtoytoolkit.la
 
 libtoytoolkit_la_SOURCES =                     \
@@ -182,7 +178,6 @@ weston_editor_LDADD = libtoytoolkit.la $(PANGO_LIBS)
 weston_editor_CPPFLAGS = $(AM_CPPFLAGS) $(PANGO_CFLAGS)
 endif
 
-keyboard = weston-keyboard
 weston_keyboard_SOURCES =                      \
        keyboard.c                              \
        desktop-shell-client-protocol.h         \

diff --git a/tests/Makefile.am b/tests/Makefile.am
index baf8b7c..d7bdcf6 100644 (file)
--- 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 48f2b5a..1f10b1b 100644 (file)
--- 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;