diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2013-03-04 17:54:32 -0500 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2013-03-04 17:54:32 -0500 |
| commit | 91ca088e6d233c9904bafd3a449d4f83ac9d05a0 (patch) | |
| tree | fd0cd751d4265860c7ddab4e4620760a0e89bf66 | |
| parent | 25ad29b488d3e2ae10e4fee25602409fa39207f1 (diff) | |
| download | pango-91ca088e6d233c9904bafd3a449d4f83ac9d05a0.tar.gz | |
Bug 694882 - build broken - introspection of pangoxft2 and pangoxft miss libpang-1.0.la in _gir_LIBS
| -rw-r--r-- | pango/Makefile.am | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pango/Makefile.am b/pango/Makefile.am index e37a579b..c948ba6d 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -228,7 +228,7 @@ PangoFT2-1.0.gir: Pango-1.0.gir PangoFT2_1_0_gir_PACKAGES = freetype2 PangoFT2_1_0_gir_EXPORT_PACKAGES = pangoft2 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_LIBS = $(Pango_1_0_gir_LIBS) libpangoft2-1.0.la PangoFT2_1_0_gir_CFLAGS = -I$(top_builddir) -I$(top_srcdir) PangoFT2_1_0_gir_SCANNERFLAGS = --include-uninstalled=$(builddir)/Pango-1.0.gir --c-include "pango/pangoft2.h" PangoFT2_1_0_gir_FILES = $(filter-out %-private.h, $(addprefix $(srcdir)/,$(pangoft2_introspection_files))) @@ -279,7 +279,7 @@ 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_LIBS = $(PangoFT2_1_0_gir_LIBS) libpangoxft-1.0.la PangoXft_1_0_gir_CFLAGS = -I$(top_builddir) -I$(top_srcdir) $(PANGO_CFLAGS) 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))) @@ -369,11 +369,12 @@ PangoCairo-1.0.gir: Pango-1.0.gir $(PANGOCAIRO_FONT_BACKEND_GI_MODULE) 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_1_0_gir_LIBS = libpango-1.0.la libpangocairo-1.0.la +PangoCairo_1_0_gir_LIBS = $(Pango_1_0_gir_LIBS) libpangocairo-1.0.la PangoCairo_1_0_gir_CFLAGS = -I$(top_builddir) -I$(top_srcdir) $(PANGO_CFLAGS) PangoCairo_1_0_gir_SCANNERFLAGS = --include-uninstalled=$(builddir)/Pango-1.0.gir --c-include "pango/pangocairo.h" if HAVE_CAIRO_FREETYPE PangoCairo_1_0_gir_SCANNERFLAGS += --include-uninstalled=$(builddir)/$(PANGOCAIRO_FONT_BACKEND_GI_MODULE) +PangoCairo_1_0_gir_LIBS += $(PangoFT2_1_0_gir_LIBS) endif PangoCairo_1_0_gir_FILES = $(filter-out %-private.h, $(addprefix $(srcdir)/,$(pangocairo_introspection_files))) |