[build] Fix out-of-srcdir build of introspection

diff --git a/libdocument/Makefile.am b/libdocument/Makefile.am
index 8e002a4ef9ab6318f525f0615a246ed93bacc85b..82b08a56f564503d02785395144e3c69a3660960 100644 (file)
--- a/libdocument/Makefile.am
+++ b/libdocument/Makefile.am
@@ -139,23 +139,23 @@ if ENABLE_INTROSPECTION
 EvinceDocument-$(EV_API_VERSION).gir: libevdocument.la Makefile $(INST_H_FILES)
        PKG_CONFIG_PATH=$(top_builddir):$$PKG_CONFIG_PATH \
        $(G_IR_SCANNER) -v --namespace EvinceDocument \
-       --add-include-path=$(srcdir) \
-       --add-include-path=. \
        --strip-prefix=Ev \
        --nsversion=$(EV_API_VERSION) \
+       --include=GLib-2.0 \
        --include=Gio-2.0 \
+       --include=Gdk-2.0 \
+       --include=GdkPixbuf-2.0 \
        --include=Gtk-2.0 \
        --library=evdocument \
        --libtool="$(LIBTOOL)" \
        --output $@ \
-       --pkg gobject-2.0 \
-       --pkg gio-2.0 \
-       --pkg gtk+-2.0 \
        --pkg evince-document-$(EV_API_VERSION) \
        -I$(top_srcdir) \
        -I$(top_builddir) \
+       -I$(srcdir) \
+       -I$(builddir) \
        -DEVINCE_COMPILATION \
-       $(INST_H_FILES)
+       $(filter %.h,$^)
 
 girdir = $(GIRDIR)
 gir_DATA = EvinceDocument-$(EV_API_VERSION).gir

diff --git a/libview/Makefile.am b/libview/Makefile.am
index bb563a4e0df96b0ac2e66136e2e8b743fba309d9..659bef9f1741dc9f38ec04cc5531ecff80d7cf16 100644 (file)
--- a/libview/Makefile.am
+++ b/libview/Makefile.am
@@ -105,27 +105,25 @@ if ENABLE_INTROSPECTION
 EvinceView-$(EV_API_VERSION).gir: libevview.la Makefile $(INST_H_FILES)
        PKG_CONFIG_PATH=$(top_builddir):$$PKG_CONFIG_PATH \
        $(G_IR_SCANNER) -v --namespace EvinceView \
-       --add-include-path=$(srcdir) \
-       --add-include-path=. \
-       --add-include-path=$(top_srcdir) \
-       --add-include-path=$(top_builddir) \
        --add-include-path=$(top_builddir)/libdocument \
        --strip-prefix=Ev \
        --nsversion=$(EV_API_VERSION) \
+       --include=GLib-2.0 \
+       --include=GObject-2.0 \
        --include=Gio-2.0 \
+       --include=Gdk-2.0 \
+       --include=GdkPixbuf-2.0 \
        --include=Gtk-2.0 \
        --include=EvDocument-$(EV_API_VERSION) \
        --library=evview \
        --libtool="$(LIBTOOL)" \
        --output $@ \
-       --pkg gobject-2.0 \
-       --pkg gio-2.0 \
-       --pkg gtk+-2.0 \
+       --pkg evince-document-$(EV_API_VERSION) \
        --pkg evince-view-$(EV_API_VERSION) \
        -I$(top_srcdir) \
        -I$(top_builddir) \
        -DEVINCE_COMPILATION \
-       $(INST_H_FILES)
+       $(filter %.h,$^)
 
 girdir = $(GIRDIR)
 gir_DATA = EvinceView-$(EV_API_VERSION).gir