17 files changed, 19 insertions, 20 deletions
diff --git a/Makefile.am b/Makefile.am
index a3c2b814..2e5e9d0f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS = cogl
 
 if BUILD_COGL_PANGO
-SUBDIRS += pango
+SUBDIRS += cogl-pango
 endif
 
 if COGL_STANDALONE_BUILD
diff --git a/pango/Makefile.am b/cogl-pango/Makefile.am
index d691626d..6a32e367 100644
--- a/pango/Makefile.am
+++ b/cogl-pango/Makefile.am
@@ -16,17 +16,17 @@ source_h_priv = \
 	cogl-pango-pipeline-cache.h
 
 if COGL_STANDALONE_BUILD
-lib_LTLIBRARIES = libcoglpango.la
+lib_LTLIBRARIES = libcogl-pango.la
 else
-noinst_LTLIBRARIES = libcoglpango.la
+noinst_LTLIBRARIES = libcogl-pango.la
 endif
 
-libcoglpango_la_SOURCES = $(source_c) $(source_h) $(source_h_priv)
-libcoglpango_la_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) $(MAINTAINER_CFLAGS)
-libcoglpango_la_LIBADD = $(COGL_DEP_LIBS) $(COGL_EXTRA_LDFLAGS)
+libcogl_pango_la_SOURCES = $(source_c) $(source_h) $(source_h_priv)
+libcogl_pango_la_CFLAGS = $(COGL_DEP_CFLAGS) $(COGL_EXTRA_CFLAGS) $(MAINTAINER_CFLAGS)
+libcogl_pango_la_LIBADD = $(COGL_DEP_LIBS) $(COGL_EXTRA_LDFLAGS)
 if COGL_STANDALONE_BUILD
-libcoglpango_la_LIBADD += $(top_builddir)/cogl/libcogl.la
-libcoglpango_la_LDFLAGS = \
+libcogl_pango_la_LIBADD += $(top_builddir)/cogl/libcogl.la
+libcogl_pango_la_LDFLAGS = \
 	-export-dynamic \
 	-export-symbols-regex "^cogl.*"
 	-no-undefined \
@@ -47,11 +47,11 @@ INCLUDES += \
 endif
 
 if COGL_STANDALONE_BUILD
-coglpangoheadersdir = $(includedir)/cogl/cogl
-coglpangoheaders_HEADERS = $(source_h)
+cogl_pangoheadersdir = $(includedir)/cogl/cogl
+cogl_pangoheaders_HEADERS = $(source_h)
 else
-coglpangoheadersdir = $(includedir)/clutter-@CLUTTER_API_VERSION@/cogl
-coglpangoheaders_HEADERS = $(source_h)
+cogl_pangoheadersdir = $(includedir)/clutter-@CLUTTER_API_VERSION@/cogl
+cogl_pangoheaders_HEADERS = $(source_h)
 endif
 
 pc_files = cogl-pango-1.0.pc \
diff --git a/pango/cogl-pango-1.0.pc.in b/cogl-pango/cogl-pango-1.0.pc.in
index b8b10a45..02e2ecec 100644
--- a/pango/cogl-pango-1.0.pc.in
+++ b/cogl-pango/cogl-pango-1.0.pc.in
@@ -8,6 +8,6 @@ requires=@COGL_PKG_REQUIRES@ cogl-2.0
 Name: Cogl
 Description: An object oriented GL/GLES Abstraction/Utility Layer
 Version: @COGL_1_VERSION@
-Libs: -L${libdir} -lcoglpango
+Libs: -L${libdir} -lcogl-pango
 Cflags: -I${includedir}/cogl
 Requires: ${requires}
diff --git a/pango/cogl-pango-display-list.c b/cogl-pango/cogl-pango-display-list.c
index a79cf0f1..a79cf0f1 100644
--- a/pango/cogl-pango-display-list.c
+++ b/cogl-pango/cogl-pango-display-list.c
diff --git a/pango/cogl-pango-display-list.h b/cogl-pango/cogl-pango-display-list.h
index dd14edd4..dd14edd4 100644
--- a/pango/cogl-pango-display-list.h
+++ b/cogl-pango/cogl-pango-display-list.h
diff --git a/pango/cogl-pango-fontmap.c b/cogl-pango/cogl-pango-fontmap.c
index 1bee8f0c..1bee8f0c 100644
--- a/pango/cogl-pango-fontmap.c
+++ b/cogl-pango/cogl-pango-fontmap.c
diff --git a/pango/cogl-pango-glyph-cache.c b/cogl-pango/cogl-pango-glyph-cache.c
index bbcfe8f7..bbcfe8f7 100644
--- a/pango/cogl-pango-glyph-cache.c
+++ b/cogl-pango/cogl-pango-glyph-cache.c
diff --git a/pango/cogl-pango-glyph-cache.h b/cogl-pango/cogl-pango-glyph-cache.h
index 2020447d..2020447d 100644
--- a/pango/cogl-pango-glyph-cache.h
+++ b/cogl-pango/cogl-pango-glyph-cache.h
diff --git a/pango/cogl-pango-pipeline-cache.c b/cogl-pango/cogl-pango-pipeline-cache.c
index 5f6a5a03..5f6a5a03 100644
--- a/pango/cogl-pango-pipeline-cache.c
+++ b/cogl-pango/cogl-pango-pipeline-cache.c
diff --git a/pango/cogl-pango-pipeline-cache.h b/cogl-pango/cogl-pango-pipeline-cache.h
index d095c584..d095c584 100644
--- a/pango/cogl-pango-pipeline-cache.h
+++ b/cogl-pango/cogl-pango-pipeline-cache.h
diff --git a/pango/cogl-pango-private.h b/cogl-pango/cogl-pango-private.h
index 447e853f..447e853f 100644
--- a/pango/cogl-pango-private.h
+++ b/cogl-pango/cogl-pango-private.h
diff --git a/pango/cogl-pango-render.c b/cogl-pango/cogl-pango-render.c
index 72cfbcb1..72cfbcb1 100644
--- a/pango/cogl-pango-render.c
+++ b/cogl-pango/cogl-pango-render.c
diff --git a/pango/cogl-pango.h b/cogl-pango/cogl-pango.h
index 8e7165df..8e7165df 100644
--- a/pango/cogl-pango.h
+++ b/cogl-pango/cogl-pango.h
diff --git a/pango/cogl-pango.pc.in b/cogl-pango/cogl-pango.pc.in
index fe08697b..09075106 100644
--- a/pango/cogl-pango.pc.in
+++ b/cogl-pango/cogl-pango.pc.in
@@ -8,6 +8,6 @@ requires=@COGL_PKG_REQUIRES@
 Name: Cogl
 Description: An pango integration library for Cogl
 Version: @COGL_VERSION@
-Libs: -L${libdir} -lcoglpango
+Libs: -L${libdir} -lcogl-pango
 Cflags: -I${includedir}/cogl -DCOGL_ENABLE_EXPERIMENTAL_2_0_API
 Requires: ${requires}
diff --git a/cogl/Makefile.am b/cogl/Makefile.am
index 9f505ea0..70f666a8 100644
--- a/cogl/Makefile.am
+++ b/cogl/Makefile.am
@@ -367,7 +367,7 @@ libcogl_la_LIBADD += -ldl
 endif
 if COGL_STANDALONE_BUILD
 # XXX: The aim is to eventually get rid of all private API exports
-# for coglpango.
+# for cogl-pango.
 libcogl_la_LDFLAGS = \
 	-no-undefined \
 	-version-info @COGL_LT_CURRENT@:@COGL_LT_REVISION@:@COGL_LT_AGE@ \
diff --git a/configure.ac b/configure.ac
index 8187bced..1fbb8dc1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -732,9 +732,9 @@ cogl/Makefile
 cogl/cogl-1.0.pc
 cogl/cogl-$COGL_MAJOR_VERSION.0.pc:cogl/cogl.pc.in
 cogl/cogl-defines.h
-pango/Makefile
-pango/cogl-pango-1.0.pc
-pango/cogl-pango-$COGL_MAJOR_VERSION.0.pc:pango/cogl-pango.pc.in
+cogl-pango/Makefile
+cogl-pango/cogl-pango-1.0.pc
+cogl-pango/cogl-pango-$COGL_MAJOR_VERSION.0.pc:cogl-pango/cogl-pango.pc.in
 examples/Makefile
 po/Makefile.in
 )
diff --git a/examples/Makefile.am b/examples/Makefile.am
index a36befe8..a96ac6b9 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -16,8 +16,7 @@ AM_CPPFLAGS = \
 
 
 common_ldadd = \
-	$(top_builddir)/cogl/libcogl.la \
-	$(top_builddir)/pango/libcoglpango.la
+	$(top_builddir)/cogl/libcogl.la
 
 noinst_PROGRAMS = hello