[caribou: 10/23] rename module to caribou-gtk-module

[Eitan Isaacson <eitani src gnome org>]

commit 06ef2d72bb2b5bef2610e605b03013244c1b4b23
Author: Dan Winship <danw gnome org>
Date:   Fri Aug 5 09:38:49 2011 -0400

    rename module to caribou-gtk-module
    
    If the module is just named "libcaribou.so", then
    gobject-introspection will get confused and think that
    $libdir/gtk-3.0/modules/libcaribou.so is the same thing as
    $libdir/libcaribou.so, and so it won't dlopen the real libcaribou, and
    so, eg, gnome-shell will crash because keyboard.js can't find any of
    the libcaribou types/methods it needs.
    
    also, fix Makefiles to use tabs consistently

 modules/gtk2/Makefile.am |   30 +++++++++++++++---------------
 modules/gtk3/Makefile.am |   30 +++++++++++++++---------------
 2 files changed, 30 insertions(+), 30 deletions(-)
---
diff --git a/modules/gtk2/Makefile.am b/modules/gtk2/Makefile.am
index 57e9022..2580827 100644
--- a/modules/gtk2/Makefile.am
+++ b/modules/gtk2/Makefile.am
@@ -1,29 +1,29 @@
 gtk_modulesdir = @GTK2_MODULES_DIR@
-gtk_modules_LTLIBRARIES = libcaribou.la
+gtk_modules_LTLIBRARIES = libcaribou-gtk-module.la
 
-libcaribou_la_SOURCES = \
+libcaribou_gtk_module_la_SOURCES = \
 	caribou-gtk-module.vala \
 	caribou-module.c \
 	$(NULL)
 
-libcaribou_la_VALAFLAGS = \
+libcaribou_gtk_module_la_VALAFLAGS = \
 	-h caribou-gtk-module.h \
-    --vapidir=. \
+	--vapidir=. \
 	--pkg gtk+-2.0 \
 	-D GTK2 \
 	$(VALAGLAFS)
 
-libcaribou_la_CFLAGS = \
-        @GTK2_CFLAGS@ \
-        -DG_LOG_DOMAIN=\"CARIBOU\" \
-        $(NULL)
+libcaribou_gtk_module_la_CFLAGS = \
+	@GTK2_CFLAGS@ \
+	-DG_LOG_DOMAIN=\"CARIBOU\" \
+	$(NULL)
 
-libcaribou_la_LIBADD = \
-        @GTK2_LIBS@ \
-        $(NULL)
+libcaribou_gtk_module_la_LIBADD = \
+	@GTK2_LIBS@ \
+	$(NULL)
 
-libcaribou_la_LDFLAGS = \
-        -avoid-version \
-        -module \
-        $(NULL)
+libcaribou_gtk_module_la_LDFLAGS = \
+	-avoid-version \
+	-module \
+	$(NULL)
 
diff --git a/modules/gtk3/Makefile.am b/modules/gtk3/Makefile.am
index c25655c..c7a86f5 100644
--- a/modules/gtk3/Makefile.am
+++ b/modules/gtk3/Makefile.am
@@ -1,28 +1,28 @@
 gtk_modulesdir = @GTK3_MODULES_DIR@
-gtk_modules_LTLIBRARIES = libcaribou.la
+gtk_modules_LTLIBRARIES = libcaribou-gtk-module.la
 
-libcaribou_la_SOURCES = \
+libcaribou_gtk_module_la_SOURCES = \
 	caribou-gtk-module.vala \
 	caribou-module.c \
 	$(NULL)
 
-libcaribou_la_VALAFLAGS = \
+libcaribou_gtk_module_la_VALAFLAGS = \
 	-h caribou-gtk-module.h \
-    --vapidir=. \
+	--vapidir=. \
 	--pkg gtk+-3.0 \
 	$(VALAGLAFS)
 
-libcaribou_la_CFLAGS = \
-        @GTK3_CFLAGS@ \
-        -DG_LOG_DOMAIN=\"CARIBOU\" \
-        $(NULL)
+libcaribou_gtk_module_la_CFLAGS = \
+	@GTK3_CFLAGS@ \
+	-DG_LOG_DOMAIN=\"CARIBOU\" \
+	$(NULL)
 
-libcaribou_la_LIBADD = \
-        @GTK3_LIBS@ \
-        $(NULL)
+libcaribou_gtk_module_la_LIBADD = \
+	@GTK3_LIBS@ \
+	$(NULL)
 
-libcaribou_la_LDFLAGS = \
-        -avoid-version \
-        -module \
-        $(NULL)
+libcaribou_gtk_module_la_LDFLAGS = \
+	-avoid-version \
+	-module \
+	$(NULL)