diff options
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | pango/Makefile.am | 19 |
2 files changed, 12 insertions, 9 deletions
diff --git a/configure.in b/configure.in index 1a5e18c5..eaf49969 100644 --- a/configure.in +++ b/configure.in @@ -468,7 +468,7 @@ PKG_CHECK_MODULES(LIBTHAI, libthai >= $LIBTHAI_REQUIRED_VERSION, have_libthai=tr # Checks for GObject Introspection # -GOBJECT_INTROSPECTION_CHECK([0.6.7]) +GOBJECT_INTROSPECTION_CHECK([0.9.5]) # # Modules to build diff --git a/pango/Makefile.am b/pango/Makefile.am index cef644f1..dbdf781a 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -173,7 +173,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 = $(addprefix $(srcdir)/,$(pango_introspection_files)) +Pango_1_0_gir_FILES = $(filter-out %-private.h pango-color-table.h, $(addprefix $(srcdir)/,$(pango_introspection_files))) # ------------------- libpangox ------------------- @@ -277,11 +277,12 @@ 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_FILES = $(addprefix $(srcdir)/,$(pangoft2_introspection_files)) +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 ------------------- @@ -327,10 +328,11 @@ 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_FILES = $(addprefix $(srcdir)/,$(pangoxft_introspection_files)) +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 ------------------- @@ -409,10 +411,11 @@ 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_FILES = $(addprefix $(srcdir)/,$(pangocairo_introspection_files)) +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 ------------------- |