projects
/
profile
/
ivi
/
weston-ivi-shell.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ea520d5
)
build: Don't try to build weston-info if client build is disabled
author
Kristian Høgsberg
<krh@bitplanet.net>
Wed, 1 Jan 2014 20:56:44 +0000
(12:56 -0800)
committer
Kristian Høgsberg
<krh@bitplanet.net>
Wed, 1 Jan 2014 21:52:20 +0000
(13:52 -0800)
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
clients/Makefile.am
patch
|
blob
|
history
diff --git
a/clients/Makefile.am
b/clients/Makefile.am
index
2f14fbd
..
4f338f2
100644
(file)
--- 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 \