mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure: set up simple clients independently from the others 

Namely, simple-client and simple-shm.

Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
This commit is contained in:
Tiago Vignatti 2011-07-21 16:35:40 +03:00 committed by Kristian Høgsberg
parent e81fe8346c
commit 93165e3e23
3 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@ -1,5 +1 @@
if BUILD_CLIENTS
clients = clients
endif
SUBDIRS = compositor $(clients) data
SUBDIRS = compositor clients data

27
clients/Makefile.am
View File

@ -1,15 +1,25 @@
noinst_PROGRAMS = \
gears \
noinst_PROGRAMS = $(clients_programs) \
$(poppler_programs) \
$(simple_clients_programs)
if BUILD_SIMPLE_CLIENTS
simple_clients_programs = simple-client simple-shm
simple_client_SOURCES = simple-client.c
simple_client_LDADD = $(SIMPLE_CLIENT_LIBS) -lm
simple_shm_SOURCES = simple-shm.c
simple_shm_LDADD = $(SIMPLE_CLIENT_LIBS)
endif
if BUILD_CLIENTS
clients_programs = gears \
flower \
screenshot \
terminal \
image \
$(poppler_programs) \
dnd \
smoke \
resizor \
simple-client \
simple-shm \
eventdemo
noinst_LIBRARIES = libtoytoolkit.a
@ -55,12 +65,6 @@ smoke_LDADD = $(toolkit_libs)
resizor_SOURCES = resizor.c
resizor_LDADD = $(toolkit_libs)
simple_client_SOURCES = simple-client.c
simple_client_LDADD = $(SIMPLE_CLIENT_LIBS) -lm
simple_shm_SOURCES = simple-shm.c
simple_shm_LDADD = $(SIMPLE_CLIENT_LIBS)
eventdemo_SOURCES = eventdemo.c
eventdemo_LDADD = $(toolkit_libs)
@ -69,6 +73,7 @@ BUILT_SOURCES = \
screenshooter-protocol.c
CLEANFILES = $(BUILT_SOURCES)
endif
@wayland_scanner_rules@

9
configure.ac
View File

@ -86,14 +86,19 @@ if test x$enable_wayland_compositor == xyes; then
PKG_CHECK_MODULES(WAYLAND_COMPOSITOR, [wayland-client wayland-egl])
fi
AC_ARG_ENABLE(simple-clients, [ --enable-simple-clients],, enable_simple_clients=yes)
AM_CONDITIONAL(BUILD_SIMPLE_CLIENTS, test x$enable_simple_clients == xyes)
if test x$enable_simple_clients == xyes; then
AC_DEFINE([BUILD_SIMPLE_CLIENTS], [1], [Build the Wayland simple clients])
PKG_CHECK_MODULES(SIMPLE_CLIENT,
[egl >= 7.10 glesv2 wayland-client wayland-egl])
fi
AC_ARG_ENABLE(clients, [ --enable-clients],, enable_clients=yes)
AM_CONDITIONAL(BUILD_CLIENTS, test x$enable_clients == xyes)
if test x$enable_clients == xyes; then
AC_DEFINE([BUILD_CLIENTS], [1], [Build the Wayland clients])
PKG_CHECK_MODULES(SIMPLE_CLIENT,
[egl >= 7.10 glesv2 wayland-client wayland-egl])
PKG_CHECK_MODULES(CLIENT, [wayland-client wayland-egl egl >= 7.10 gl cairo >= 1.10.0 gdk-pixbuf-2.0 glib-2.0 gobject-2.0 xkbcommon])
PKG_CHECK_MODULES(POPPLER, [poppler-glib gdk-2.0 gio-2.0],