summaryrefslogtreecommitdiff
path: root/pango
diff options
context:
space:
mode:
authorRico Tzschichholz <ricotz@t-online.de>2011-07-15 18:30:03 +0200
committerColin Walters <walters@verbum.org>2011-07-22 11:05:48 -0400
commit8de0841234c9e9b07ba5be19833ef40476102952 (patch)
tree288f1d30148031a32e8dfd0bda1d6d0376f26356 /pango
parent42c1f6c71abf625e4086f05af84f712cbc45eea4 (diff)
downloadpango-8de0841234c9e9b07ba5be19833ef40476102952.tar.gz
Fix introspection build using uninstalled GIRs
https://bugzilla.gnome.org/show_bug.cgi?id=654689
Diffstat (limited to 'pango')
-rw-r--r--pango/Makefile.am6
1 files changed, 3 insertions, 3 deletions
diff --git a/pango/Makefile.am b/pango/Makefile.am
index f81846dc..bba133df 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -326,14 +326,14 @@ pangoxft_introspection_files = \
$(libpangoxft_1_0_la_SOURCES)
PangoXft-1.0.gir: libpangoxft-1.0.la
-PangoXft-1.0.gir: PangoFT2-1.0.gir
+PangoXft-1.0.gir: Pango-1.0.gir PangoFT2-1.0.gir
PangoXft_1_0_gir_PACKAGES = gobject-2.0 freetype2
PangoXft_1_0_gir_EXPORT_PACKAGES = pangoxft
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 --c-include "pango/pangoxft.h"
+PangoXft_1_0_gir_SCANNERFLAGS = --include-uninstalled=$(builddir)/Pango-1.0.gir --include-uninstalled=$(builddir)/PangoFT2-1.0.gir --c-include "pango/pangoxft.h"
PangoXft_1_0_gir_FILES = $(filter-out %-private.h, $(addprefix $(srcdir)/,$(pangoxft_introspection_files)))
# ------------------- libpangocairo -------------------
@@ -440,7 +440,7 @@ 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_EXPORT_PACKAGES = pangocairo
-PangoCairo_1_0_gir_INCLUDES = GObject-2.0 cairo-1.0 $(PANGOCAIRO_FONT_BACKEND_GI_MODULE)
+PangoCairo_1_0_gir_INCLUDES = GObject-2.0 cairo-1.0
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 --c-include "pango/pangocairo.h"