Fix distcheck

[profile/ivi/weston-ivi-shell.git] / clients / Makefile.am

diff --git a/clients/Makefile.am b/clients/Makefile.am
index 1f7125f..e323de6 100644 (file)
--- a/clients/Makefile.am
+++ b/clients/Makefile.am
@@ -2,15 +2,18 @@ noinst_PROGRAMS = $(clients_programs)                 \
        $(poppler_programs)                     \
        $(simple_clients_programs)
 
-libexec_PROGRAMS = $(desktop_shell)
+libexec_PROGRAMS = $(desktop_shell) $(tablet_shell)
 
 if BUILD_SIMPLE_CLIENTS
-simple_clients_programs = simple-egl simple-shm
+simple_clients_programs = simple-egl simple-shm simple-touch
 simple_egl_SOURCES = simple-egl.c
 simple_egl_LDADD = $(SIMPLE_CLIENT_LIBS) -lm
 
 simple_shm_SOURCES = simple-shm.c
 simple_shm_LDADD = $(SIMPLE_CLIENT_LIBS)
+
+simple_touch_SOURCES = simple-touch.c
+simple_touch_LDADD = $(SIMPLE_CLIENT_LIBS)
 endif
 
 if BUILD_CLIENTS
@@ -26,7 +29,8 @@ clients_programs =                            \
        wscreensaver                            \
        eventdemo
 
-desktop_shell = wayland-desktop-shell
+desktop_shell = weston-desktop-shell
+tablet_shell = weston-tablet-shell
 
 noinst_LIBRARIES = libtoytoolkit.a
 
@@ -39,8 +43,7 @@ libtoytoolkit_a_SOURCES =                     \
        window.c                                \
        window.h                                \
        cairo-util.c                            \
-       cairo-util.h                            \
-       config.c
+       cairo-util.h
 
 toolkit_libs =                                 \
        libtoytoolkit.a                         \
@@ -70,23 +73,41 @@ smoke_LDADD = $(toolkit_libs)
 resizor_SOURCES = resizor.c
 resizor_LDADD = $(toolkit_libs)
 
-wscreensaver_SOURCES = wscreensaver.c wscreensaver-glue.c glmatrix.c
+wscreensaver_SOURCES =                         \
+       wscreensaver.c                          \
+       wscreensaver.h                          \
+       desktop-shell-client-protocol.h         \
+       desktop-shell-protocol.c                \
+       wscreensaver-glue.c                     \
+       wscreensaver-glue.h                     \
+       glmatrix.c                              \
+       matrix3.xpm
 wscreensaver_LDADD = $(toolkit_libs) -lGLU
 
 eventdemo_SOURCES = eventdemo.c
 eventdemo_LDADD = $(toolkit_libs)
 
-wayland_desktop_shell_SOURCES =                        \
+weston_desktop_shell_SOURCES =                 \
        desktop-shell.c                         \
        desktop-shell-client-protocol.h         \
        desktop-shell-protocol.c
-wayland_desktop_shell_LDADD = $(toolkit_libs)
+weston_desktop_shell_LDADD = $(toolkit_libs)   \
+       ../shared/libconfig-parser.la
+
+weston_tablet_shell_SOURCES =                  \
+       tablet-shell.c                          \
+       tablet-shell-client-protocol.h          \
+       tablet-shell-protocol.c
+weston_tablet_shell_LDADD = $(toolkit_libs)    \
+       ../shared/libconfig-parser.la
 
 BUILT_SOURCES =                                        \
        screenshooter-client-protocol.h         \
        screenshooter-protocol.c                \
        desktop-shell-client-protocol.h         \
-       desktop-shell-protocol.c
+       desktop-shell-protocol.c                \
+       tablet-shell-client-protocol.h          \
+       tablet-shell-protocol.c
 
 CLEANFILES = $(BUILT_SOURCES)
 endif