keyboard: Rename keyboard to weston-keyboard

Signed-off-by: Jan Arne Petersen <jpetersen@openismus.com>

diff --git a/clients/.gitignore b/clients/.gitignore
index 6ed849d7fdf2fa6d438a65ed4f3c18042e7b5887..5437de4b91da17c5dedcb96e6a7317caef24dcb6 100644 (file)
--- a/clients/.gitignore
+++ b/clients/.gitignore
@@ -10,7 +10,7 @@ gears
 image
 input-method-protocol.c
 input-method-client-protocol.h
-keyboard
+weston-keyboard
 libtoytoolkit.a
 resizor
 screenshooter-client-protocol.h

diff --git a/clients/Makefile.am b/clients/Makefile.am
index 9259a4eb8bf3ec38d1e837ec236b7715f7f2f943..a6927d79acc16a6458f00469f243d1078383fd27 100644 (file)
--- a/clients/Makefile.am
+++ b/clients/Makefile.am
@@ -12,7 +12,8 @@ libexec_PROGRAMS =                            \
        $(desktop_shell)                        \
        $(tablet_shell)                         \
        $(screenshooter)                        \
-       $(screensaver)
+       $(screensaver)                          \
+       $(keyboard)
 
 AM_CFLAGS = $(GCC_CFLAGS)
 AM_CPPFLAGS =                                  \
@@ -60,7 +61,6 @@ clients_programs =                            \
        eventdemo                               \
        clickdot                                \
        editor                                  \
-       keyboard                                \
        $(full_gl_client_programs)
 
 desktop_shell = weston-desktop-shell
@@ -123,13 +123,14 @@ editor_SOURCES =                          \
        text-client-protocol.h
 editor_LDADD = $(toolkit_libs)
 
-keyboard_SOURCES =                             \
+keyboard = weston-keyboard
+weston_keyboard_SOURCES =                      \
        keyboard.c                              \
        desktop-shell-client-protocol.h         \
        desktop-shell-protocol.c                \
        input-method-protocol.c                 \
        input-method-client-protocol.h
-keyboard_LDADD = $(toolkit_libs)
+weston_keyboard_LDADD = $(toolkit_libs)
 
 weston_info_SOURCES =                          \
        weston-info.c                           \