From 3f8629d719a43332d9ac31d706920d0bec8746f4 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Tue, 11 Jan 2011 14:02:58 +0100 Subject: [PATCH] gir: Fix build of Gio-2.0.gir - include gio-unix headers properly into Gio gir - don't include gsettingsbackend.h --- Makefile-gir.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile-gir.am b/Makefile-gir.am index 4798a79..5751f80 100644 --- a/Makefile-gir.am +++ b/Makefile-gir.am @@ -155,6 +155,7 @@ else GIO_UNIX_HDRS= GIO_UNIX_PACKAGES = endif +GIO_CINCLUDES=$(patsubst %,--c-include='%',$(shell echo $(GIO_UNIX_HDRS))) Gio-2.0.gir: GObject-2.0.gir @@ -165,6 +166,7 @@ Gio_2_0_gir_SCANNERFLAGS = \ --warn-all \ --identifier-prefix=G \ --c-include="gio/gio.h" \ + $(GIO_CINCLUDES) \ --add-include-path=. \ $(Gio_2_0_gir_DOCSRC) @@ -175,7 +177,7 @@ Gio_2_0_gir_CFLAGS = \ -I$(GIO_LIBDIR)/glib-2.0/include Gio_2_0_gir_FILES = \ $(GIO_UNIX_HDRS) \ - $(GIO_INCLUDEDIR)/gio/*.h \ + $(filter-out %/gsettingsbackend.h, $(shell echo $(GIO_INCLUDEDIR)/gio/*.h)) \ gir/gio-2.0.c BUILT_GIRSOURCES += Gio-2.0.gir -- 2.7.4