summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Withnall <philip.withnall@collabora.co.uk>2016-09-12 14:27:22 +0100
committerPhilip Withnall <philip.withnall@collabora.co.uk>2016-11-21 12:21:57 +0000
commit43de9fbadf1a389049cb6e67069c6c16cd0629f2 (patch)
treed257cc20d6661cc23ef98f296de245fb8ae49a36
parentb49b5679e354bdfe96460443367f886b20c8ce0f (diff)
downloadgobject-introspection-43de9fbadf1a389049cb6e67069c6c16cd0629f2.tar.gz
build: Do not scan glib-autocleanups.h for GLib-2.0.gir
Since autoptr typedefs are filtered out (bug #755882), scanning this header is useless. It can cause warnings due to not #including all the headers whose types it references: /usr/include/glib-2.0/glib/glib-autocleanups.h:41: syntax error, unexpected typedef-name, expecting identifier or '(' in 'typedef GAsyncQueue *GAsyncQueue_autoptr;' at 'GAsyncQueue_autoptr' Fix that by filtering it out of the list of headers to scan. https://bugzilla.gnome.org/show_bug.cgi?id=768816
-rw-r--r--Makefile-gir.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile-gir.am b/Makefile-gir.am
index 919e2697..86ab5bf1 100644
--- a/Makefile-gir.am
+++ b/Makefile-gir.am
@@ -78,7 +78,7 @@ GLib_2_0_gir_CFLAGS = \
-D__G_I18N_LIB_H__
GLib_2_0_gir_FILES = \
$(GLIB_LIBDIR)/glib-2.0/include/glibconfig.h \
- $(GLIB_INCLUDEDIR)/glib/*.h \
+ $(filter-out $(GLIB_INCLUDEDIR)/glib/glib-autocleanups.h,$(wildcard $(GLIB_INCLUDEDIR)/glib/*.h)) \
$(GLIB_INCLUDEDIR)/gobject/glib-types.h \
gir/glib-2.0.c
if HAVE_GIO_UNIX