From 6f2193545ef67db60fc7e7ab1548a82e5a8b8348 Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Thu, 5 May 2011 22:04:07 +0100 Subject: [PATCH] consistently refer to cogl-pango as "cogl-pango" This renames the pango directory to cogl-pango and it renames the installed library to libcogl-pango instead of libcoglpango. --- Makefile.am | 2 +- {pango => cogl-pango}/Makefile.am | 22 +++++++++---------- {pango => cogl-pango}/cogl-pango-1.0.pc.in | 2 +- .../cogl-pango-display-list.c | 0 .../cogl-pango-display-list.h | 0 {pango => cogl-pango}/cogl-pango-fontmap.c | 0 .../cogl-pango-glyph-cache.c | 0 .../cogl-pango-glyph-cache.h | 0 .../cogl-pango-pipeline-cache.c | 0 .../cogl-pango-pipeline-cache.h | 0 {pango => cogl-pango}/cogl-pango-private.h | 0 {pango => cogl-pango}/cogl-pango-render.c | 0 {pango => cogl-pango}/cogl-pango.h | 0 {pango => cogl-pango}/cogl-pango.pc.in | 2 +- cogl/Makefile.am | 2 +- configure.ac | 6 ++--- examples/Makefile.am | 3 +-- 17 files changed, 19 insertions(+), 20 deletions(-) rename {pango => cogl-pango}/Makefile.am (65%) rename {pango => cogl-pango}/cogl-pango-1.0.pc.in (90%) rename {pango => cogl-pango}/cogl-pango-display-list.c (100%) rename {pango => cogl-pango}/cogl-pango-display-list.h (100%) rename {pango => cogl-pango}/cogl-pango-fontmap.c (100%) rename {pango => cogl-pango}/cogl-pango-glyph-cache.c (100%) rename {pango => cogl-pango}/cogl-pango-glyph-cache.h (100%) rename {pango => cogl-pango}/cogl-pango-pipeline-cache.c (100%) rename {pango => cogl-pango}/cogl-pango-pipeline-cache.h (100%) rename {pango => cogl-pango}/cogl-pango-private.h (100%) rename {pango => cogl-pango}/cogl-pango-render.c (100%) rename {pango => cogl-pango}/cogl-pango.h (100%) rename {pango => cogl-pango}/cogl-pango.pc.in (91%) diff --git a/Makefile.am b/Makefile.am index a3c2b8141..2e5e9d0f6 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 similarity index 65% rename from pango/Makefile.am rename to cogl-pango/Makefile.am index d691626d6..6a32e3670 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 similarity index 90% rename from pango/cogl-pango-1.0.pc.in rename to cogl-pango/cogl-pango-1.0.pc.in index b8b10a456..02e2ecec8 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 similarity index 100% rename from pango/cogl-pango-display-list.c rename to cogl-pango/cogl-pango-display-list.c diff --git a/pango/cogl-pango-display-list.h b/cogl-pango/cogl-pango-display-list.h similarity index 100% rename from pango/cogl-pango-display-list.h rename to cogl-pango/cogl-pango-display-list.h diff --git a/pango/cogl-pango-fontmap.c b/cogl-pango/cogl-pango-fontmap.c similarity index 100% rename from pango/cogl-pango-fontmap.c rename to cogl-pango/cogl-pango-fontmap.c diff --git a/pango/cogl-pango-glyph-cache.c b/cogl-pango/cogl-pango-glyph-cache.c similarity index 100% rename from pango/cogl-pango-glyph-cache.c rename to cogl-pango/cogl-pango-glyph-cache.c diff --git a/pango/cogl-pango-glyph-cache.h b/cogl-pango/cogl-pango-glyph-cache.h similarity index 100% rename from pango/cogl-pango-glyph-cache.h rename to cogl-pango/cogl-pango-glyph-cache.h diff --git a/pango/cogl-pango-pipeline-cache.c b/cogl-pango/cogl-pango-pipeline-cache.c similarity index 100% rename from pango/cogl-pango-pipeline-cache.c rename to cogl-pango/cogl-pango-pipeline-cache.c diff --git a/pango/cogl-pango-pipeline-cache.h b/cogl-pango/cogl-pango-pipeline-cache.h similarity index 100% rename from pango/cogl-pango-pipeline-cache.h rename to cogl-pango/cogl-pango-pipeline-cache.h diff --git a/pango/cogl-pango-private.h b/cogl-pango/cogl-pango-private.h similarity index 100% rename from pango/cogl-pango-private.h rename to cogl-pango/cogl-pango-private.h diff --git a/pango/cogl-pango-render.c b/cogl-pango/cogl-pango-render.c similarity index 100% rename from pango/cogl-pango-render.c rename to cogl-pango/cogl-pango-render.c diff --git a/pango/cogl-pango.h b/cogl-pango/cogl-pango.h similarity index 100% rename from pango/cogl-pango.h rename to cogl-pango/cogl-pango.h diff --git a/pango/cogl-pango.pc.in b/cogl-pango/cogl-pango.pc.in similarity index 91% rename from pango/cogl-pango.pc.in rename to cogl-pango/cogl-pango.pc.in index fe08697bf..090751068 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 9f505ea0e..70f666a8b 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 8187bced7..1fbb8dc12 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 a36befe86..a96ac6b9b 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