From 0aa7efebfbbe72336f5db23279ef1c93ab839b17 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 31 Aug 2010 18:12:40 -0400 Subject: introspection: Filter out private headers We shouldn't scan private headers. Also add --warn-all. https://bugzilla.gnome.org/show_bug.cgi?id=627973 --- pango/Makefile.am | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pango/Makefile.am b/pango/Makefile.am index 5747400b..07f36753 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -7,7 +7,7 @@ GPATH = $(srcdir) include $(INTROSPECTION_MAKEFILE) INTROSPECTION_GIRS = -INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --add-include-path=. +INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(srcdir) --add-include-path=. INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --includedir=. if HAVE_FREETYPE @@ -171,7 +171,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 = $(pango_introspection_files) +Pango_1_0_gir_FILES = $(filter-out %-private.h, $(pango_introspection_files)) # ------------------- libpangox ------------------- @@ -279,7 +279,7 @@ 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_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_FILES = $(filter-out %-private.h, $(addprefix $(srcdir)/,$(pangoft2_introspection_files))) # ------------------- libpangoxft ------------------- @@ -328,7 +328,7 @@ 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_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_FILES = $(filter-out %-private.h, $(addprefix $(srcdir)/,$(pangoxft_introspection_files))) # ------------------- libpangocairo ------------------- @@ -415,7 +415,7 @@ 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_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_FILES = $(filter-out %-private.h, $(addprefix $(srcdir)/,$(pangocairo_introspection_files))) # ------------------- libpangowin32 ------------------- -- cgit v1.2.1