diff options
| author | Pavel Holejsovsky <pavel.holejsovsky@gmail.com> | 2012-03-23 07:09:02 +0100 |
|---|---|---|
| committer | Pavel Holejsovsky <pavel.holejsovsky@gmail.com> | 2012-04-07 18:10:19 +0200 |
| commit | e6a2ea4f55dab8f77dc5cc93fd67b8dacc39a75a (patch) | |
| tree | 9961ed8ed73a3dcc3883cac23ad070b28d1d1862 | |
| parent | 67069097ffc2cbb4dc839e5a63607344d827593d (diff) | |
| download | pango-e6a2ea4f55dab8f77dc5cc93fd67b8dacc39a75a.tar.gz | |
Fix sourcedir!=builddir .gir build from source tarball
Setting -I$(top_builddir) before -I$(top_srcdir) causes that
g-ir-scanner picks up boxing definitions generated by glib-mkenums.
https://bugzilla.gnome.org/show_bug.cgi?id=672133
| -rw-r--r-- | pango/Makefile.am | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pango/Makefile.am b/pango/Makefile.am index 319f4595..ffa3ad77 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -172,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) -I$(top_builddir) $(PANGO_CFLAGS) +Pango_1_0_gir_CFLAGS = -I$(top_builddir) -I$(top_srcdir) $(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" @@ -282,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) -I$(top_builddir) +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))) @@ -333,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) -I$(top_builddir) $(PANGO_CFLAGS) +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))) @@ -443,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) -I$(top_builddir) $(PANGO_CFLAGS) +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 --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))) |