[PATCH 05/15] keyboard: Rename keyboard to weston-keyboard

Jan Arne Petersen jpetersen at openismus.com
Sun Nov 4 18:26:43 PST 2012


From: Jan Arne Petersen <jpetersen at openismus.com>

Signed-off-by: Jan Arne Petersen <jpetersen at openismus.com>
---
 clients/.gitignore  | 2 +-
 clients/Makefile.am | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/clients/.gitignore b/clients/.gitignore
index 6ed849d..5437de4 100644
--- 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 9259a4e..a6927d7 100644
--- 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				\
-- 
1.7.11.7



More information about the wayland-devel mailing list