$(poppler_programs) \
$(simple_clients_programs)
+libexec_PROGRAMS = $(desktop_shell)
+
if BUILD_SIMPLE_CLIENTS
simple_clients_programs = simple-egl simple-shm
simple_egl_SOURCES = simple-egl.c
dnd \
smoke \
resizor \
- eventdemo \
- desktop-shell
+ eventdemo
+
+desktop_shell = wayland-desktop-shell
noinst_LIBRARIES = libtoytoolkit.a
eventdemo_SOURCES = eventdemo.c
eventdemo_LDADD = $(toolkit_libs)
-desktop_shell_SOURCES = \
+wayland_desktop_shell_SOURCES = \
desktop-shell.c \
desktop-shell-client-protocol.h \
desktop-shell-protocol.c
-desktop_shell_LDADD = $(toolkit_libs)
+wayland_desktop_shell_LDADD = $(toolkit_libs)
BUILT_SOURCES = \
screenshooter-client-protocol.h \
AM_CPPFLAGS = \
-DDATADIR='"$(datadir)"' \
-DMODULEDIR='"$(moduledir)"' \
+ -DLIBEXECDIR='"$(libexecdir)"' \
-DXSERVER_PATH='"@XSERVER_PATH@"' \
$(COMPOSITOR_CFLAGS)
static int
launch_desktop_shell_process(struct wl_shell *shell)
{
- const char *shell_exe = "./clients/desktop-shell";
+ const char *shell_exe = LIBEXECDIR "/wayland-desktop-shell";
struct wlsc_compositor *compositor = shell->compositor;
char s[32];
int sv[2], flags;