[cogl] Don't include cogl-pango.h when scanning introspection data
- From: Neil Roberts <nroberts src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl] Don't include cogl-pango.h when scanning introspection data
- Date: Mon, 16 May 2011 14:48:14 +0000 (UTC)
commit a466dc272b28f8caaad4de369b57e37481415064
Author: Neil Roberts <neil linux intel com>
Date: Mon May 16 15:41:25 2011 +0100
Don't include cogl-pango.h when scanning introspection data
cogl/cogl-pango.h can't be included unless the include directory for
Pango is given in the compiler flags. In an application, it is
expected that if they are using this header then they would pull in
cogl-pango-1.0.pc which would provide this. However when building Cogl
itself we might be building without Pango support so the Makefile
can't rely on PANGO_CFLAGS. This was breaking building the
introspection data because cogl-pango.h was listed as one of the files
to scan but it can't be included.
cogl/Makefile.am | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/cogl/Makefile.am b/cogl/Makefile.am
index ccd0ba4..de07dcd 100644
--- a/cogl/Makefile.am
+++ b/cogl/Makefile.am
@@ -84,7 +84,6 @@ cogl_public_h = \
$(srcdir)/cogl-clip-state.h \
$(srcdir)/cogl-framebuffer.h \
$(srcdir)/cogl-clutter.h \
- $(srcdir)/cogl-pango.h \
$(srcdir)/cogl.h \
$(NULL)
@@ -379,6 +378,7 @@ nodist_libcogl_la_SOURCES = $(BUILT_SOURCES)
cogl_headers = \
$(cogl_public_h) \
$(srcdir)/cogl-deprecated.h \
+ $(srcdir)/cogl-pango.h \
$(NULL)
coglincludedir = $(includedir)/cogl/cogl
@@ -395,7 +395,7 @@ Cogl-1.0.gir: libcogl.la Makefile
Cogl_1_0_gir_NAMESPACE = Cogl
Cogl_1_0_gir_VERSION = 1.0
Cogl_1_0_gir_LIBS = libcogl.la
-Cogl_1_0_gir_FILES = $(cogl_headers) cogl-enum-types.h
+Cogl_1_0_gir_FILES = $(cogl_public_h) cogl-enum-types.h
Cogl_1_0_gir_CFLAGS = $(INCLUDES) $(AM_CPPFLAGS)
Cogl_1_0_gir_INCLUDES = GL-1.0 GObject-2.0
Cogl_1_0_gir_EXPORT_PACKAGES = cogl-1.0
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]