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
This commit is contained in:
+7
-12
@@ -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 \
|
||||
|
||||
Reference in New Issue
Block a user