16 files changed, 20 insertions, 20 deletions
diff --git a/Makefile.am b/Makefile.am
index 39679217..81743407 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = libldmgreeter data greeters po src themes doc
+SUBDIRS = libldmgreeter-gobject data greeters po src themes doc
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-gtk-doc
 
diff --git a/NEWS b/NEWS
index 3710b0e6..d096d1da 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 Overview of changes in lightdm 0.2.1
 
     * Use "lightdm" as default PAM service and make it configurable
+    * Rename libldmgreeter to libldmgreeter-gobject
 
 Overview of changes in lightdm 0.2.0
 
diff --git a/configure.ac b/configure.ac
index b0fbe011..b78e17cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ PKG_CHECK_MODULES(LIGHTDM, [
     xdmcp
 ])
 
-PKG_CHECK_MODULES(LIBLDMGREETER, [
+PKG_CHECK_MODULES(LIBLDMGREETER_GOBJECT, [
     glib-2.0
     gio-unix-2.0
     gobject-2.0
@@ -213,8 +213,8 @@ data/Makefile
 data/init/Makefile
 doc/Makefile
 greeters/Makefile
-libldmgreeter/libldmgreeter-0.pc
-libldmgreeter/Makefile
+libldmgreeter-gobject/libldmgreeter-gobject-0.pc
+libldmgreeter-gobject/Makefile
 po/Makefile.in
 src/Makefile
 themes/Makefile
diff --git a/greeters/Makefile.am b/greeters/Makefile.am
index cb25e63a..4b6f0a50 100644
--- a/greeters/Makefile.am
+++ b/greeters/Makefile.am
@@ -7,12 +7,12 @@ if HAVE_WEBKIT_GREETER
 libexec_PROGRAMS += ldm-webkit-greeter
 endif
 
-LIBGREETER_LIB = $(top_builddir)/libldmgreeter/libldmgreeter.la
+LIBGREETER_LIB = $(top_builddir)/libldmgreeter-gobject/libldmgreeter.la
 LIBGREETER_CFLAGS = \
-	-I$(top_srcdir)/libldmgreeter
+	-I$(top_srcdir)/libldmgreeter-gobject
 LIBGREETER_LDADD = \
-	-L$(top_builddir)/libldmgreeter \
-	-lldmgreeter
+	-L$(top_builddir)/libldmgreeter-gobject \
+	-lldmgreeter-gobject
 
 ldm_gtk_greeter_SOURCES = \
 	ldm-gtk-greeter.c
diff --git a/libldmgreeter/Makefile.am b/libldmgreeter-gobject/Makefile.am
index 01d07bb4..342cfb4a 100644
--- a/libldmgreeter/Makefile.am
+++ b/libldmgreeter-gobject/Makefile.am
@@ -1,25 +1,24 @@
-lib_LTLIBRARIES = libldmgreeter.la
+lib_LTLIBRARIES = libldmgreeter-gobject.la
 
-libldmgreeterinclude_HEADERS = \
+libldmgreeter_gobjectinclude_HEADERS = \
 	greeter.h \
 	language.h \
 	layout.h \
 	session.h \
 	user.h
+libldmgreeter_gobjectincludedir=$(includedir)/lightdm-gobject-0/lightdm
 
-libldmgreeter_la_LIBADD = $(LIBLDMGREETER_LIBS)
-libldmgreeter_la_CFLAGS = $(LIBLDMGREETER_CFLAGS) \
+libldmgreeter_gobject_la_LIBADD = $(LIBLDMGREETER_GOBJECT_LIBS)
+libldmgreeter_gobject_la_CFLAGS = $(LIBLDMGREETER_GOBJECT_CFLAGS) \
 	-DXSESSIONS_DIR=\"$(XSESSIONS_DIR)\"
 
-libldmgreeter_la_SOURCES= \
+libldmgreeter_gobject_la_SOURCES= \
 	greeter.c \
 	language.c \
 	layout.c \
 	session.c \
 	user.c
 
-libldmgreeterincludedir=$(includedir)/lightdm-0/lightdm
-
 if HAVE_INTROSPECTION
 
 -include $(INTROSPECTION_MAKEFILE)
@@ -28,11 +27,11 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
 
 INTROSPECTION_GIRS = LightDMGreeter-0.gir
 
-LightDMGreeter-0.gir: libldmgreeter.la
+LightDMGreeter-0.gir: libldmgreeter-gobject.la
 LightDMGreeter_0_gir_INCLUDES = GObject-2.0
 LightDMGreeter_0_gir_CFLAGS = $(INCLUDES)
-LightDMGreeter_0_gir_LIBS = libldmgreeter.la
-LightDMGreeter_0_gir_FILES = $(libldmgreeter_la_SOURCES)
+LightDMGreeter_0_gir_LIBS = libldmgreeter-gobject.la
+LightDMGreeter_0_gir_FILES = $(libldmgreeter_gobject_la_SOURCES)
 
 girdir = $(datadir)/gir-1.0
 gir_DATA = LightDMGreeter-0.gir
@@ -43,10 +42,10 @@ typelib_DATA = LightDMGreeter-0.typelib
 endif
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libldmgreeter-0.pc
+pkgconfig_DATA = libldmgreeter-gobject-0.pc
 
 DISTCLEANFILES = \
 	Makefile.in \
-	libldmgreeter-0.pc \
+	$(pkgconfig_DATA) \
 	$(gir_DATA) \
 	$(typelib_DATA)
diff --git a/libldmgreeter/greeter.c b/libldmgreeter-gobject/greeter.c
index ae15874a..ae15874a 100644
--- a/libldmgreeter/greeter.c
+++ b/libldmgreeter-gobject/greeter.c
diff --git a/libldmgreeter/greeter.h b/libldmgreeter-gobject/greeter.h
index 6ac78514..6ac78514 100644
--- a/libldmgreeter/greeter.h
+++ b/libldmgreeter-gobject/greeter.h
diff --git a/libldmgreeter/language.c b/libldmgreeter-gobject/language.c
index b3e9373b..b3e9373b 100644
--- a/libldmgreeter/language.c
+++ b/libldmgreeter-gobject/language.c
diff --git a/libldmgreeter/language.h b/libldmgreeter-gobject/language.h
index a67289ac..a67289ac 100644
--- a/libldmgreeter/language.h
+++ b/libldmgreeter-gobject/language.h
diff --git a/libldmgreeter/layout.c b/libldmgreeter-gobject/layout.c
index c475e65d..c475e65d 100644
--- a/libldmgreeter/layout.c
+++ b/libldmgreeter-gobject/layout.c
diff --git a/libldmgreeter/layout.h b/libldmgreeter-gobject/layout.h
index 1707bc97..1707bc97 100644
--- a/libldmgreeter/layout.h
+++ b/libldmgreeter-gobject/layout.h
diff --git a/libldmgreeter/libldmgreeter-0.pc.in b/libldmgreeter-gobject/libldmgreeter-gobject-0.pc.in
index b9573bde..b9573bde 100644
--- a/libldmgreeter/libldmgreeter-0.pc.in
+++ b/libldmgreeter-gobject/libldmgreeter-gobject-0.pc.in
diff --git a/libldmgreeter/session.c b/libldmgreeter-gobject/session.c
index 37e16093..37e16093 100644
--- a/libldmgreeter/session.c
+++ b/libldmgreeter-gobject/session.c
diff --git a/libldmgreeter/session.h b/libldmgreeter-gobject/session.h
index e1410727..e1410727 100644
--- a/libldmgreeter/session.h
+++ b/libldmgreeter-gobject/session.h
diff --git a/libldmgreeter/user.c b/libldmgreeter-gobject/user.c
index 025e7b1f..025e7b1f 100644
--- a/libldmgreeter/user.c
+++ b/libldmgreeter-gobject/user.c
diff --git a/libldmgreeter/user.h b/libldmgreeter-gobject/user.h
index db3d8d16..db3d8d16 100644
--- a/libldmgreeter/user.h
+++ b/libldmgreeter-gobject/user.h