From 2574242575e6a1d7184bb43c61ba3090de611971 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 22 Jul 2011 11:30:17 -0400 Subject: [PATCH] build: Fix srcdir != builddir --- pango/Makefile.am | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pango/Makefile.am b/pango/Makefile.am index bba133d..c425285 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -27,6 +27,7 @@ INCLUDES = \ -DSYSCONFDIR=\"$(sysconfdir)\" \ -DLIBDIR=\"$(libdir)\" \ -I$(top_srcdir) \ + -I$(top_builddir) \ $(PANGO_DEBUG_FLAGS) \ $(GLIB_CFLAGS) \ $(XFT_CFLAGS) \ @@ -171,7 +172,7 @@ Pango_1_0_gir_PACKAGES = gobject-2.0 cairo freetype2 Pango_1_0_gir_EXPORT_PACKAGES = pango 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_CFLAGS = -I$(top_srcdir) -I$(top_builddir) $(PANGO_CFLAGS) Pango_1_0_gir_FILES = $(filter-out %-private.h pango-color-table.h, $(pango_introspection_files)) Pango_1_0_gir_SCANNERFLAGS = --c-include "pango/pango.h" @@ -281,7 +282,7 @@ 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_CFLAGS = -I$(top_srcdir) +PangoFT2_1_0_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir) 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))) @@ -332,7 +333,7 @@ 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_CFLAGS = -I$(top_srcdir) -I$(top_builddir) $(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))) @@ -442,7 +443,7 @@ 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 = libpangocairo-1.0.la -PangoCairo_1_0_gir_CFLAGS = -I$(top_srcdir) $(PANGO_CFLAGS) +PangoCairo_1_0_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir) $(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" PangoCairo_1_0_gir_FILES = $(filter-out %-private.h, $(addprefix $(srcdir)/,$(pangocairo_introspection_files))) -- 2.7.4