diff options
| author | Colin Walters <walters@verbum.org> | 2010-09-28 15:51:44 -0400 |
|---|---|---|
| committer | Vincent Untz <vuntz@gnome.org> | 2010-09-29 12:38:26 +0200 |
| commit | 457f5eb78316f6a81735183a3c96c3817dcd4136 (patch) | |
| tree | 681f7c03a3315d0697ef06ced5180fefc70c0905 | |
| parent | 14b387aaf9ac6f0f2f2f2428233c1c62ccf13be2 (diff) | |
| download | pango-457f5eb78316f6a81735183a3c96c3817dcd4136.tar.gz | |
introspection: Use --include-uninstalled
For inter-module includes we need to use --include-uninstalled,
otherwise we may try to process pkg-config entries for uninstalled
.pc files.
Also:
* Don't include pangoft2 in its own package list.
* Filter out non-public pango-color-table.h
https://bugzilla.gnome.org/show_bug.cgi?id=630857
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | pango/Makefile.am | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/configure.in b/configure.in index 2e194f58..d5007de9 100644 --- a/configure.in +++ b/configure.in @@ -481,7 +481,7 @@ PKG_CHECK_MODULES(LIBTHAI, libthai >= $LIBTHAI_REQUIRED_VERSION, have_libthai=tr # Checks for GObject Introspection # -GOBJECT_INTROSPECTION_CHECK([0.6.14]) +GOBJECT_INTROSPECTION_CHECK([0.9.5]) # # Modules to build diff --git a/pango/Makefile.am b/pango/Makefile.am index 07f36753..176d70ac 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -171,7 +171,7 @@ Pango_1_0_gir_PACKAGES = gobject-2.0 cairo freetype2 Pango_1_0_gir_INCLUDES = GObject-2.0 cairo-1.0 Pango_1_0_gir_LIBS = libpango-1.0.la Pango_1_0_gir_CFLAGS = -I$(top_srcdir) $(PANGO_CFLAGS) -Pango_1_0_gir_FILES = $(filter-out %-private.h, $(pango_introspection_files)) +Pango_1_0_gir_FILES = $(filter-out %-private.h pango-color-table.h, $(pango_introspection_files)) # ------------------- libpangox ------------------- @@ -275,10 +275,11 @@ pangoft2_introspection_files = \ PangoFT2-1.0.gir: libpangoft2-1.0.la PangoFT2-1.0.gir: Pango-1.0.gir -PangoFT2_1_0_gir_PACKAGES = gobject-2.0 freetype2 pangoft2 -PangoFT2_1_0_gir_INCLUDES = GObject-2.0 cairo-1.0 Pango-1.0 freetype2-2.0 fontconfig-2.0 +PangoFT2_1_0_gir_PACKAGES = freetype2 +PangoFT2_1_0_gir_INCLUDES = GObject-2.0 cairo-1.0 freetype2-2.0 fontconfig-2.0 PangoFT2_1_0_gir_LIBS = libpangoft2-1.0.la PangoFT2_1_0_gir_CFLAGS = -I$(top_srcdir) +PangoFT2_1_0_gir_SCANNERFLAGS = --include-uninstalled=$(builddir)/Pango-1.0.gir PangoFT2_1_0_gir_FILES = $(filter-out %-private.h, $(addprefix $(srcdir)/,$(pangoft2_introspection_files))) # ------------------- libpangoxft ------------------- @@ -325,9 +326,10 @@ PangoXft-1.0.gir: libpangoxft-1.0.la PangoXft-1.0.gir: PangoFT2-1.0.gir PangoXft_1_0_gir_PACKAGES = gobject-2.0 freetype2 -PangoXft_1_0_gir_INCLUDES = GObject-2.0 PangoFT2-1.0 xft-2.0 xlib-2.0 +PangoXft_1_0_gir_INCLUDES = GObject-2.0 xft-2.0 xlib-2.0 PangoXft_1_0_gir_LIBS = libpangoxft-1.0.la PangoXft_1_0_gir_CFLAGS = -I$(top_srcdir) $(PANGO_CFLAGS) +PangoXft_1_0_gir_SCANNERFLAGS = --include-uninstalled=$(builddir)/PangoFT2-1.0.gir PangoXft_1_0_gir_FILES = $(filter-out %-private.h, $(addprefix $(srcdir)/,$(pangoxft_introspection_files))) # ------------------- libpangocairo ------------------- @@ -412,9 +414,10 @@ PangoCairo-1.0.gir: libpangocairo-1.0.la PangoCairo-1.0.gir: Pango-1.0.gir $(PANGOCAIRO_FONT_BACKEND_GI_MODULE).gir PangoCairo_1_0_gir_PACKAGES = gobject-2.0 cairo -PangoCairo_1_0_gir_INCLUDES = GObject-2.0 cairo-1.0 Pango-1.0 $(PANGOCAIRO_FONT_BACKEND_GI_MODULE) +PangoCairo_1_0_gir_INCLUDES = GObject-2.0 cairo-1.0 $(PANGOCAIRO_FONT_BACKEND_GI_MODULE) PangoCairo_1_0_gir_LIBS = libpangocairo-1.0.la PangoCairo_1_0_gir_CFLAGS = -I$(top_srcdir) $(PANGO_CFLAGS) +PangoCairo_1_0_gir_SCANNERFLAGS = --include-uninstalled=$(builddir)/Pango-1.0.gir --include-uninstalled=$(builddir)/$(PANGOCAIRO_FONT_BACKEND_GI_MODULE).gir PangoCairo_1_0_gir_FILES = $(filter-out %-private.h, $(addprefix $(srcdir)/,$(pangocairo_introspection_files))) # ------------------- libpangowin32 ------------------- |