summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@bitplanet.net>2014-01-01 12:56:44 -0800
committerKristian Høgsberg <krh@bitplanet.net>2014-01-01 13:52:20 -0800
commit96e1c0b6e52356337ce54072517ba85b4bace852 (patch)
tree2e2ae6a015aff24f5d66b713186e7dbe78752aca
parentea520d510c45eaba00ad8633888c09dd5a886d2e (diff)
build: Don't try to build weston-info if client build is disabled
The weston-info sources are defined conditionally in the if BUILD_CLIENTS section, but we always added weston-info to bin_PROGRAMS. https://bugs.freedesktop.org/show_bug.cgi?id=72812
-rw-r--r--clients/Makefile.am6
1 files changed, 2 insertions, 4 deletions
diff --git a/clients/Makefile.am b/clients/Makefile.am
index 2f14fbd5..4f338f25 100644
--- a/clients/Makefile.am
+++ b/clients/Makefile.am
@@ -1,6 +1,4 @@
-bin_PROGRAMS = \
- weston-info \
- $(terminal)
+bin_PROGRAMS = $(install_clients)
demo_clients = \
$(clients_programs) \
@@ -63,7 +61,7 @@ weston_simple_egl_LDADD = $(SIMPLE_EGL_CLIENT_LIBS) -lm
endif
if BUILD_CLIENTS
-terminal = weston-terminal
+install_clients = weston-terminal weston-info
clients_programs = \
weston-flower \