[gimp] libgimp*: move GObject Introspection into libgimp/.



commit 2dde79b3e732400e76c1698374b76bcc224d38c6
Author: Jehan <jehan girinstud io>
Date:   Thu Aug 8 13:32:37 2019 +0200

    libgimp*: move GObject Introspection into libgimp/.
    
    libgimp is anyway processed at the very end after all other libgimp*
    were built. This way, it also fixes #3746, by removing the $(top_srcdir)
    everywhere from introspected files, hence making the build work again
    with older automake.

 Makefile.am                |  92 ------------
 libgimp/Makefile.am        |  99 +++++++++++++
 libgimp/Makefile.gi        | 344 ++++++++++++++++++++++-----------------------
 libgimpbase/Makefile.gi    |  62 ++++----
 libgimpcolor/Makefile.gi   |  52 +++----
 libgimpconfig/Makefile.gi  |  42 +++---
 libgimpmath/Makefile.gi    |  10 +-
 libgimpmodule/Makefile.gi  |  10 +-
 libgimpthumb/Makefile.gi   |  16 +--
 libgimpwidgets/Makefile.gi | 228 +++++++++++++++---------------
 10 files changed, 481 insertions(+), 474 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index de979769fb..57c08a827b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -168,95 +168,3 @@ git-version.h: update-git-version-header
        fi
 
 .PHONY: update-git-version-header
-
-### GObject introspection
-
--include $(INTROSPECTION_MAKEFILE)
-AUTOMAKE_OPTIONS = subdir-objects
-include $(top_srcdir)/libgimp/Makefile.gi
-include $(top_srcdir)/libgimpbase/Makefile.gi
-include $(top_srcdir)/libgimpcolor/Makefile.gi
-include $(top_srcdir)/libgimpconfig/Makefile.gi
-include $(top_srcdir)/libgimpmath/Makefile.gi
-include $(top_srcdir)/libgimpmodule/Makefile.gi
-include $(top_srcdir)/libgimpthumb/Makefile.gi
-include $(top_srcdir)/libgimpwidgets/Makefile.gi
-
-INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path="$(srcdir)" --add-include-path="$(shell 
$(PKG_CONFIG) --define-variable=datadir="$(datadir)" --variable=girdir gobject-introspection-1.0)"
-INTROSPECTION_COMPILER_ARGS = --includedir="$(srcdir)" --includedir="$(shell $(PKG_CONFIG) 
--define-variable=datadir="$(datadir)" --variable=girdir gobject-introspection-1.0)"
-INTROSPECTION_SCANNER_ENV = CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" 
CXXFLAGS="$(CXXFLAGS)"
-
-Gimp-@GIMP_API_VERSION@.gir: \
-       libgimp/libgimp-@GIMP_API_VERSION@.la                   \
-       libgimp/libgimpui-@GIMP_API_VERSION@.la                 \
-       libgimpbase/libgimpbase-@GIMP_API_VERSION@.la           \
-       libgimpcolor/libgimpcolor-@GIMP_API_VERSION@.la         \
-       libgimpconfig/libgimpconfig-@GIMP_API_VERSION@.la       \
-       libgimpmath/libgimpmath-@GIMP_API_VERSION@.la           \
-       libgimpmodule/libgimpmodule-@GIMP_API_VERSION@.la       \
-       libgimpthumb/libgimpthumb-@GIMP_API_VERSION@.la         \
-       libgimpwidgets/libgimpwidgets-@GIMP_API_VERSION@.la     \
-       Makefile
-
-# The various other GObject-Introspected libraries our API references
-# (i.e. types used in parameters or returned values).
-Gimp_@GIMP_API_MAJOR_VERSION@_@GIMP_API_MINOR_VERSION@_gir_INCLUDES = \
-       cairo-1.0       \
-       GdkPixbuf-2.0   \
-       Gegl-0.4        \
-       Gio-2.0         \
-       GLib-2.0        \
-       GObject-2.0     \
-       Gtk-3.0
-
-Gimp_@GIMP_API_MAJOR_VERSION@_@GIMP_API_MINOR_VERSION@_gir_CFLAGS = \
-       -DGIMP_COMPILATION              \
-       -DGIMP_BASE_COMPILATION         \
-       -DGIMP_COLOR_COMPILATION        \
-       -DGIMP_CONFIG_COMPILATION       \
-       -DGIMP_MATH_COMPILATION         \
-       -DGIMP_MODULE_COMPILATION       \
-       -DGIMP_THUMB_COMPILATION        \
-       -DGIMP_WIDGETS_COMPILATION      \
-       $(AM_CFLAGS)                    \
-       $(AM_CPPFLAGS)                  \
-       -I$(top_builddir)               \
-       -I$(top_srcdir)                 \
-       $(CAIRO_CFLAGS)                 \
-       $(GDK_PIXBUF_CFLAGS)            \
-       $(BABL_CFLAGS)                  \
-       $(GEGL_CFLAGS)                  \
-       $(GTK_CFLAGS)
-
-Gimp_@GIMP_API_MAJOR_VERSION@_@GIMP_API_MINOR_VERSION@_gir_LIBS = \
-       libgimp/libgimp-@GIMP_API_VERSION@.la                   \
-       libgimp/libgimpui-@GIMP_API_VERSION@.la                 \
-       libgimpbase/libgimpbase-@GIMP_API_VERSION@.la           \
-       libgimpcolor/libgimpcolor-@GIMP_API_VERSION@.la         \
-       libgimpconfig/libgimpconfig-@GIMP_API_VERSION@.la       \
-       libgimpmath/libgimpmath-@GIMP_API_VERSION@.la           \
-       libgimpmodule/libgimpmodule-@GIMP_API_VERSION@.la       \
-       libgimpthumb/libgimpthumb-@GIMP_API_VERSION@.la         \
-       libgimpwidgets/libgimpwidgets-@GIMP_API_VERSION@.la
-
-Gimp_@GIMP_API_MAJOR_VERSION@_@GIMP_API_MINOR_VERSION@_gir_FILES =     \
-       $(libgimp_introspectable)                                       \
-       $(libgimpui_introspectable)                                     \
-       $(libgimpbase_introspectable)                                   \
-       $(libgimpcolor_introspectable)                                  \
-       $(libgimpconfig_introspectable)                                 \
-       $(libgimpmath_introspectable)                                   \
-       $(libgimpmodule_introspectable)                                 \
-       $(libgimpthumb_introspectable)                                  \
-       $(libgimpwidgets_introspectable)
-
-INTROSPECTION_GIRS += Gimp-@GIMP_API_VERSION@.gir
-
-girdir = $(datadir)/gir-1.0
-gir_DATA = $(INTROSPECTION_GIRS)
-
-typelibdir = $(libdir)/girepository-1.0
-typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
-
-CLEANFILES += $(gir_DATA) $(typelib_DATA)
diff --git a/libgimp/Makefile.am b/libgimp/Makefile.am
index 55a4e4cd2e..f388b4bc60 100644
--- a/libgimp/Makefile.am
+++ b/libgimp/Makefile.am
@@ -281,3 +281,102 @@ gimpuimarshal.c: gimpuimarshal.h
        $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=_gimpui_marshal $(srcdir)/gimpuimarshal.list --header --body 
xgen-umc \
        && cp xgen-umc $(@F) \
        && rm -f xgen-umc xgen-umc~
+
+### GObject introspection
+
+-include $(INTROSPECTION_MAKEFILE)
+AUTOMAKE_OPTIONS = subdir-objects
+include ../libgimp/Makefile.gi
+include ../libgimpbase/Makefile.gi
+include ../libgimpcolor/Makefile.gi
+include ../libgimpconfig/Makefile.gi
+include ../libgimpmath/Makefile.gi
+include ../libgimpmodule/Makefile.gi
+include ../libgimpthumb/Makefile.gi
+include ../libgimpwidgets/Makefile.gi
+
+INTROSPECTION_GIRS =
+INTROSPECTION_SCANNER_ARGS = \
+       --warn-all                      \
+       --add-include-path="$(srcdir)"  \
+       --add-include-path="$(shell $(PKG_CONFIG) --define-variable=datadir="$(datadir)" --variable=girdir 
gobject-introspection-1.0)"
+
+INTROSPECTION_COMPILER_ARGS = \
+       --includedir="$(srcdir)"        \
+       --includedir="$(shell $(PKG_CONFIG) --define-variable=datadir="$(datadir)" --variable=girdir 
gobject-introspection-1.0)"
+
+INTROSPECTION_SCANNER_ENV = CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" 
CXXFLAGS="$(CXXFLAGS)"
+
+Gimp-@GIMP_API_VERSION@.gir: \
+       ../libgimp/libgimp-@GIMP_API_VERSION@.la                \
+       ../libgimp/libgimpui-@GIMP_API_VERSION@.la              \
+       ../libgimpbase/libgimpbase-@GIMP_API_VERSION@.la        \
+       ../libgimpcolor/libgimpcolor-@GIMP_API_VERSION@.la      \
+       ../libgimpconfig/libgimpconfig-@GIMP_API_VERSION@.la    \
+       ../libgimpmath/libgimpmath-@GIMP_API_VERSION@.la        \
+       ../libgimpmodule/libgimpmodule-@GIMP_API_VERSION@.la    \
+       ../libgimpthumb/libgimpthumb-@GIMP_API_VERSION@.la      \
+       ../libgimpwidgets/libgimpwidgets-@GIMP_API_VERSION@.la  \
+       Makefile
+
+# The various other GObject-Introspected libraries our API references
+# (i.e. types used in parameters or returned values).
+Gimp_@GIMP_API_MAJOR_VERSION@_@GIMP_API_MINOR_VERSION@_gir_INCLUDES = \
+       cairo-1.0       \
+       GdkPixbuf-2.0   \
+       Gegl-0.4        \
+       Gio-2.0         \
+       GLib-2.0        \
+       GObject-2.0     \
+       Gtk-3.0
+
+Gimp_@GIMP_API_MAJOR_VERSION@_@GIMP_API_MINOR_VERSION@_gir_CFLAGS = \
+       -DGIMP_COMPILATION              \
+       -DGIMP_BASE_COMPILATION         \
+       -DGIMP_COLOR_COMPILATION        \
+       -DGIMP_CONFIG_COMPILATION       \
+       -DGIMP_MATH_COMPILATION         \
+       -DGIMP_MODULE_COMPILATION       \
+       -DGIMP_THUMB_COMPILATION        \
+       -DGIMP_WIDGETS_COMPILATION      \
+       $(AM_CFLAGS)                    \
+       $(AM_CPPFLAGS)                  \
+       -I$(top_builddir)               \
+       -I$(top_srcdir)                 \
+       $(CAIRO_CFLAGS)                 \
+       $(GDK_PIXBUF_CFLAGS)            \
+       $(BABL_CFLAGS)                  \
+       $(GEGL_CFLAGS)                  \
+       $(GTK_CFLAGS)
+
+Gimp_@GIMP_API_MAJOR_VERSION@_@GIMP_API_MINOR_VERSION@_gir_LIBS = \
+       ../libgimp/libgimp-@GIMP_API_VERSION@.la                \
+       ../libgimp/libgimpui-@GIMP_API_VERSION@.la              \
+       ../libgimpbase/libgimpbase-@GIMP_API_VERSION@.la        \
+       ../libgimpcolor/libgimpcolor-@GIMP_API_VERSION@.la      \
+       ../libgimpconfig/libgimpconfig-@GIMP_API_VERSION@.la    \
+       ../libgimpmath/libgimpmath-@GIMP_API_VERSION@.la        \
+       ../libgimpmodule/libgimpmodule-@GIMP_API_VERSION@.la    \
+       ../libgimpthumb/libgimpthumb-@GIMP_API_VERSION@.la      \
+       ../libgimpwidgets/libgimpwidgets-@GIMP_API_VERSION@.la
+
+Gimp_@GIMP_API_MAJOR_VERSION@_@GIMP_API_MINOR_VERSION@_gir_FILES =     \
+       $(libgimp_introspectable)                                       \
+       $(libgimpui_introspectable)                                     \
+       $(libgimpbase_introspectable)                                   \
+       $(libgimpcolor_introspectable)                                  \
+       $(libgimpconfig_introspectable)                                 \
+       $(libgimpmath_introspectable)                                   \
+       $(libgimpmodule_introspectable)                                 \
+       $(libgimpthumb_introspectable)                                  \
+       $(libgimpwidgets_introspectable)
+
+INTROSPECTION_GIRS += Gimp-@GIMP_API_VERSION@.gir
+
+girdir = $(datadir)/gir-1.0
+gir_DATA = $(INTROSPECTION_GIRS)
+
+typelibdir = $(libdir)/girepository-1.0
+typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+
+CLEANFILES += $(gir_DATA) $(typelib_DATA)
diff --git a/libgimp/Makefile.gi b/libgimp/Makefile.gi
index d9ad257763..a1ae4aed8f 100644
--- a/libgimp/Makefile.gi
+++ b/libgimp/Makefile.gi
@@ -1,183 +1,183 @@
 # Introspectable sources for libgimp and libgimpui
 
 PDB_WRAPPERS_C = \
-       $(top_srcdir)/libgimp/gimp_pdb.c                        \
-       $(top_srcdir)/libgimp/gimpbrush_pdb.c                   \
-       $(top_srcdir)/libgimp/gimpbrushes_pdb.c                 \
-       $(top_srcdir)/libgimp/gimpbrushselect_pdb.c             \
-       $(top_srcdir)/libgimp/gimpbuffer_pdb.c                  \
-       $(top_srcdir)/libgimp/gimpchannel_pdb.c                 \
-       $(top_srcdir)/libgimp/gimpcontext_pdb.c                 \
-       $(top_srcdir)/libgimp/gimpdebug_pdb.c                   \
-       $(top_srcdir)/libgimp/gimpdisplay_pdb.c                 \
-       $(top_srcdir)/libgimp/gimpdrawable_pdb.c                \
-       $(top_srcdir)/libgimp/gimpdrawablecolor_pdb.c           \
-       $(top_srcdir)/libgimp/gimpdrawableedit_pdb.c            \
-       $(top_srcdir)/libgimp/gimpdynamics_pdb.c                \
-       $(top_srcdir)/libgimp/gimpedit_pdb.c                    \
-       $(top_srcdir)/libgimp/gimpfileops_pdb.c                 \
-       $(top_srcdir)/libgimp/gimpfloatingsel_pdb.c             \
-       $(top_srcdir)/libgimp/gimpfonts_pdb.c                   \
-       $(top_srcdir)/libgimp/gimpfontselect_pdb.c              \
-       $(top_srcdir)/libgimp/gimpgimprc_pdb.c                  \
-       $(top_srcdir)/libgimp/gimpgradient_pdb.c                \
-       $(top_srcdir)/libgimp/gimpgradients_pdb.c               \
-       $(top_srcdir)/libgimp/gimpgradientselect_pdb.c          \
-       $(top_srcdir)/libgimp/gimphelp_pdb.c                    \
-       $(top_srcdir)/libgimp/gimpimage_pdb.c                   \
-       $(top_srcdir)/libgimp/gimpimagecolorprofile_pdb.c       \
-       $(top_srcdir)/libgimp/gimpimageconvert_pdb.c            \
-       $(top_srcdir)/libgimp/gimpimagegrid_pdb.c               \
-       $(top_srcdir)/libgimp/gimpimageguides_pdb.c             \
-       $(top_srcdir)/libgimp/gimpimagesamplepoints_pdb.c       \
-       $(top_srcdir)/libgimp/gimpimageselect_pdb.c             \
-       $(top_srcdir)/libgimp/gimpimagetransform_pdb.c          \
-       $(top_srcdir)/libgimp/gimpimageundo_pdb.c               \
-       $(top_srcdir)/libgimp/gimpitem_pdb.c                    \
-       $(top_srcdir)/libgimp/gimpitemtransform_pdb.c           \
-       $(top_srcdir)/libgimp/gimplayer_pdb.c                   \
-       $(top_srcdir)/libgimp/gimpmessage_pdb.c                 \
-       $(top_srcdir)/libgimp/gimppainttools_pdb.c              \
-       $(top_srcdir)/libgimp/gimppalette_pdb.c                 \
-       $(top_srcdir)/libgimp/gimppalettes_pdb.c                \
-       $(top_srcdir)/libgimp/gimppaletteselect_pdb.c           \
-       $(top_srcdir)/libgimp/gimppattern_pdb.c                 \
-       $(top_srcdir)/libgimp/gimppatterns_pdb.c                \
-       $(top_srcdir)/libgimp/gimppatternselect_pdb.c           \
-       $(top_srcdir)/libgimp/gimppdb_pdb.c                     \
-       $(top_srcdir)/libgimp/gimpprogress_pdb.c                \
-       $(top_srcdir)/libgimp/gimpselection_pdb.c               \
-       $(top_srcdir)/libgimp/gimptextlayer_pdb.c               \
-       $(top_srcdir)/libgimp/gimptexttool_pdb.c                \
-       $(top_srcdir)/libgimp/gimpvectors_pdb.c
+       ../libgimp/gimp_pdb.c                   \
+       ../libgimp/gimpbrush_pdb.c                      \
+       ../libgimp/gimpbrushes_pdb.c                    \
+       ../libgimp/gimpbrushselect_pdb.c                \
+       ../libgimp/gimpbuffer_pdb.c                     \
+       ../libgimp/gimpchannel_pdb.c                    \
+       ../libgimp/gimpcontext_pdb.c                    \
+       ../libgimp/gimpdebug_pdb.c                      \
+       ../libgimp/gimpdisplay_pdb.c                    \
+       ../libgimp/gimpdrawable_pdb.c           \
+       ../libgimp/gimpdrawablecolor_pdb.c              \
+       ../libgimp/gimpdrawableedit_pdb.c               \
+       ../libgimp/gimpdynamics_pdb.c           \
+       ../libgimp/gimpedit_pdb.c                       \
+       ../libgimp/gimpfileops_pdb.c                    \
+       ../libgimp/gimpfloatingsel_pdb.c                \
+       ../libgimp/gimpfonts_pdb.c                      \
+       ../libgimp/gimpfontselect_pdb.c         \
+       ../libgimp/gimpgimprc_pdb.c                     \
+       ../libgimp/gimpgradient_pdb.c           \
+       ../libgimp/gimpgradients_pdb.c          \
+       ../libgimp/gimpgradientselect_pdb.c             \
+       ../libgimp/gimphelp_pdb.c                       \
+       ../libgimp/gimpimage_pdb.c                      \
+       ../libgimp/gimpimagecolorprofile_pdb.c  \
+       ../libgimp/gimpimageconvert_pdb.c               \
+       ../libgimp/gimpimagegrid_pdb.c          \
+       ../libgimp/gimpimageguides_pdb.c                \
+       ../libgimp/gimpimagesamplepoints_pdb.c  \
+       ../libgimp/gimpimageselect_pdb.c                \
+       ../libgimp/gimpimagetransform_pdb.c             \
+       ../libgimp/gimpimageundo_pdb.c          \
+       ../libgimp/gimpitem_pdb.c                       \
+       ../libgimp/gimpitemtransform_pdb.c              \
+       ../libgimp/gimplayer_pdb.c                      \
+       ../libgimp/gimpmessage_pdb.c                    \
+       ../libgimp/gimppainttools_pdb.c         \
+       ../libgimp/gimppalette_pdb.c                    \
+       ../libgimp/gimppalettes_pdb.c           \
+       ../libgimp/gimppaletteselect_pdb.c              \
+       ../libgimp/gimppattern_pdb.c                    \
+       ../libgimp/gimppatterns_pdb.c           \
+       ../libgimp/gimppatternselect_pdb.c              \
+       ../libgimp/gimppdb_pdb.c                        \
+       ../libgimp/gimpprogress_pdb.c           \
+       ../libgimp/gimpselection_pdb.c          \
+       ../libgimp/gimptextlayer_pdb.c          \
+       ../libgimp/gimptexttool_pdb.c           \
+       ../libgimp/gimpvectors_pdb.c
 
 PDB_WRAPPERS_H = \
-       $(top_srcdir)/libgimp/gimp_pdb_headers.h                \
-       $(top_srcdir)/libgimp/gimp_pdb.h                        \
-       $(top_srcdir)/libgimp/gimpbrush_pdb.h                   \
-       $(top_srcdir)/libgimp/gimpbrushes_pdb.h                 \
-       $(top_srcdir)/libgimp/gimpbrushselect_pdb.h             \
-       $(top_srcdir)/libgimp/gimpbuffer_pdb.h                  \
-       $(top_srcdir)/libgimp/gimpchannel_pdb.h                 \
-       $(top_srcdir)/libgimp/gimpcontext_pdb.h                 \
-       $(top_srcdir)/libgimp/gimpdebug_pdb.h                   \
-       $(top_srcdir)/libgimp/gimpdisplay_pdb.h                 \
-       $(top_srcdir)/libgimp/gimpdrawable_pdb.h                \
-       $(top_srcdir)/libgimp/gimpdrawablecolor_pdb.h           \
-       $(top_srcdir)/libgimp/gimpdrawableedit_pdb.h            \
-       $(top_srcdir)/libgimp/gimpdynamics_pdb.h                \
-       $(top_srcdir)/libgimp/gimpedit_pdb.h                    \
-       $(top_srcdir)/libgimp/gimpfileops_pdb.h                 \
-       $(top_srcdir)/libgimp/gimpfloatingsel_pdb.h             \
-       $(top_srcdir)/libgimp/gimpfonts_pdb.h                   \
-       $(top_srcdir)/libgimp/gimpfontselect_pdb.h              \
-       $(top_srcdir)/libgimp/gimpgimprc_pdb.h                  \
-       $(top_srcdir)/libgimp/gimpgradient_pdb.h                \
-       $(top_srcdir)/libgimp/gimpgradients_pdb.h               \
-       $(top_srcdir)/libgimp/gimpgradientselect_pdb.h          \
-       $(top_srcdir)/libgimp/gimphelp_pdb.h                    \
-       $(top_srcdir)/libgimp/gimpimage_pdb.h                   \
-       $(top_srcdir)/libgimp/gimpimagecolorprofile_pdb.h       \
-       $(top_srcdir)/libgimp/gimpimageconvert_pdb.h            \
-       $(top_srcdir)/libgimp/gimpimagegrid_pdb.h               \
-       $(top_srcdir)/libgimp/gimpimageguides_pdb.h             \
-       $(top_srcdir)/libgimp/gimpimagesamplepoints_pdb.h       \
-       $(top_srcdir)/libgimp/gimpimageselect_pdb.h             \
-       $(top_srcdir)/libgimp/gimpimagetransform_pdb.h          \
-       $(top_srcdir)/libgimp/gimpimageundo_pdb.h               \
-       $(top_srcdir)/libgimp/gimpitem_pdb.h                    \
-       $(top_srcdir)/libgimp/gimpitemtransform_pdb.h           \
-       $(top_srcdir)/libgimp/gimplayer_pdb.h                   \
-       $(top_srcdir)/libgimp/gimpmessage_pdb.h                 \
-       $(top_srcdir)/libgimp/gimppainttools_pdb.h              \
-       $(top_srcdir)/libgimp/gimppalette_pdb.h                 \
-       $(top_srcdir)/libgimp/gimppalettes_pdb.h                \
-       $(top_srcdir)/libgimp/gimppaletteselect_pdb.h           \
-       $(top_srcdir)/libgimp/gimppattern_pdb.h                 \
-       $(top_srcdir)/libgimp/gimppatterns_pdb.h                \
-       $(top_srcdir)/libgimp/gimppatternselect_pdb.h           \
-       $(top_srcdir)/libgimp/gimppdb_pdb.h                     \
-       $(top_srcdir)/libgimp/gimpprogress_pdb.h                \
-       $(top_srcdir)/libgimp/gimpselection_pdb.h               \
-       $(top_srcdir)/libgimp/gimptextlayer_pdb.h               \
-       $(top_srcdir)/libgimp/gimptexttool_pdb.h                \
-       $(top_srcdir)/libgimp/gimpvectors_pdb.h
+       ../libgimp/gimp_pdb_headers.h           \
+       ../libgimp/gimp_pdb.h                   \
+       ../libgimp/gimpbrush_pdb.h                      \
+       ../libgimp/gimpbrushes_pdb.h                    \
+       ../libgimp/gimpbrushselect_pdb.h                \
+       ../libgimp/gimpbuffer_pdb.h                     \
+       ../libgimp/gimpchannel_pdb.h                    \
+       ../libgimp/gimpcontext_pdb.h                    \
+       ../libgimp/gimpdebug_pdb.h                      \
+       ../libgimp/gimpdisplay_pdb.h                    \
+       ../libgimp/gimpdrawable_pdb.h           \
+       ../libgimp/gimpdrawablecolor_pdb.h              \
+       ../libgimp/gimpdrawableedit_pdb.h               \
+       ../libgimp/gimpdynamics_pdb.h           \
+       ../libgimp/gimpedit_pdb.h                       \
+       ../libgimp/gimpfileops_pdb.h                    \
+       ../libgimp/gimpfloatingsel_pdb.h                \
+       ../libgimp/gimpfonts_pdb.h                      \
+       ../libgimp/gimpfontselect_pdb.h         \
+       ../libgimp/gimpgimprc_pdb.h                     \
+       ../libgimp/gimpgradient_pdb.h           \
+       ../libgimp/gimpgradients_pdb.h          \
+       ../libgimp/gimpgradientselect_pdb.h             \
+       ../libgimp/gimphelp_pdb.h                       \
+       ../libgimp/gimpimage_pdb.h                      \
+       ../libgimp/gimpimagecolorprofile_pdb.h  \
+       ../libgimp/gimpimageconvert_pdb.h               \
+       ../libgimp/gimpimagegrid_pdb.h          \
+       ../libgimp/gimpimageguides_pdb.h                \
+       ../libgimp/gimpimagesamplepoints_pdb.h  \
+       ../libgimp/gimpimageselect_pdb.h                \
+       ../libgimp/gimpimagetransform_pdb.h             \
+       ../libgimp/gimpimageundo_pdb.h          \
+       ../libgimp/gimpitem_pdb.h                       \
+       ../libgimp/gimpitemtransform_pdb.h              \
+       ../libgimp/gimplayer_pdb.h                      \
+       ../libgimp/gimpmessage_pdb.h                    \
+       ../libgimp/gimppainttools_pdb.h         \
+       ../libgimp/gimppalette_pdb.h                    \
+       ../libgimp/gimppalettes_pdb.h           \
+       ../libgimp/gimppaletteselect_pdb.h              \
+       ../libgimp/gimppattern_pdb.h                    \
+       ../libgimp/gimppatterns_pdb.h           \
+       ../libgimp/gimppatternselect_pdb.h              \
+       ../libgimp/gimppdb_pdb.h                        \
+       ../libgimp/gimpprogress_pdb.h           \
+       ../libgimp/gimpselection_pdb.h          \
+       ../libgimp/gimptextlayer_pdb.h          \
+       ../libgimp/gimptexttool_pdb.h           \
+       ../libgimp/gimpvectors_pdb.h
 
 libgimp_introspectable = \
-       $(top_srcdir)/libgimp/gimp.c                    \
-       $(top_srcdir)/libgimp/gimp.h                    \
-       $(top_srcdir)/libgimp/gimptypes.h               \
-       $(top_srcdir)/libgimp/gimpenums.h               \
+       ../libgimp/gimp.c                       \
+       ../libgimp/gimp.h                       \
+       ../libgimp/gimptypes.h          \
+       ../libgimp/gimpenums.h          \
        ${PDB_WRAPPERS_C}                               \
        ${PDB_WRAPPERS_H}                               \
-       $(top_srcdir)/libgimp/gimpbrushselect.c         \
-       $(top_srcdir)/libgimp/gimpbrushselect.h         \
-       $(top_srcdir)/libgimp/gimpchannel.c             \
-       $(top_srcdir)/libgimp/gimpchannel.h             \
-       $(top_srcdir)/libgimp/gimpdrawable.c            \
-       $(top_srcdir)/libgimp/gimpdrawable.h            \
-       $(top_srcdir)/libgimp/gimpfontselect.c          \
-       $(top_srcdir)/libgimp/gimpfontselect.h          \
-       $(top_srcdir)/libgimp/gimpgimprc.c              \
-       $(top_srcdir)/libgimp/gimpgimprc.h              \
-       $(top_srcdir)/libgimp/gimpgradientselect.c      \
-       $(top_srcdir)/libgimp/gimpgradientselect.h      \
-       $(top_srcdir)/libgimp/gimpimage.c               \
-       $(top_srcdir)/libgimp/gimpimage.h               \
-       $(top_srcdir)/libgimp/gimpimagecolorprofile.c   \
-       $(top_srcdir)/libgimp/gimpimagecolorprofile.h   \
-       $(top_srcdir)/libgimp/gimplayer.c               \
-       $(top_srcdir)/libgimp/gimplayer.h               \
-       $(top_srcdir)/libgimp/gimppaletteselect.c       \
-       $(top_srcdir)/libgimp/gimppaletteselect.h       \
-       $(top_srcdir)/libgimp/gimpparamspecs.c          \
-       $(top_srcdir)/libgimp/gimpparamspecs.h          \
-       $(top_srcdir)/libgimp/gimppatternselect.c       \
-       $(top_srcdir)/libgimp/gimppatternselect.h       \
-       $(top_srcdir)/libgimp/gimppdb.c                 \
-       $(top_srcdir)/libgimp/gimppdb.h                 \
-       $(top_srcdir)/libgimp/gimpplugin.c              \
-       $(top_srcdir)/libgimp/gimpplugin.h              \
-       $(top_srcdir)/libgimp/gimpprocedure.c           \
-       $(top_srcdir)/libgimp/gimpprocedure.h           \
-       $(top_srcdir)/libgimp/gimpprogress.c            \
-       $(top_srcdir)/libgimp/gimpprogress.h            \
-       $(top_srcdir)/libgimp/gimpselection.c           \
-       $(top_srcdir)/libgimp/gimpselection.h
+       ../libgimp/gimpbrushselect.c            \
+       ../libgimp/gimpbrushselect.h            \
+       ../libgimp/gimpchannel.c                \
+       ../libgimp/gimpchannel.h                \
+       ../libgimp/gimpdrawable.c               \
+       ../libgimp/gimpdrawable.h               \
+       ../libgimp/gimpfontselect.c             \
+       ../libgimp/gimpfontselect.h             \
+       ../libgimp/gimpgimprc.c         \
+       ../libgimp/gimpgimprc.h         \
+       ../libgimp/gimpgradientselect.c \
+       ../libgimp/gimpgradientselect.h \
+       ../libgimp/gimpimage.c          \
+       ../libgimp/gimpimage.h          \
+       ../libgimp/gimpimagecolorprofile.c      \
+       ../libgimp/gimpimagecolorprofile.h      \
+       ../libgimp/gimplayer.c          \
+       ../libgimp/gimplayer.h          \
+       ../libgimp/gimppaletteselect.c  \
+       ../libgimp/gimppaletteselect.h  \
+       ../libgimp/gimpparamspecs.c             \
+       ../libgimp/gimpparamspecs.h             \
+       ../libgimp/gimppatternselect.c  \
+       ../libgimp/gimppatternselect.h  \
+       ../libgimp/gimppdb.c                    \
+       ../libgimp/gimppdb.h                    \
+       ../libgimp/gimpplugin.c         \
+       ../libgimp/gimpplugin.h         \
+       ../libgimp/gimpprocedure.c              \
+       ../libgimp/gimpprocedure.h              \
+       ../libgimp/gimpprogress.c               \
+       ../libgimp/gimpprogress.h               \
+       ../libgimp/gimpselection.c              \
+       ../libgimp/gimpselection.h
 
 libgimpui_introspectable =                             \
-       $(top_srcdir)/libgimp/gimpui.c                  \
-       $(top_srcdir)/libgimp/gimpui.h                  \
-       $(top_srcdir)/libgimp/gimpuitypes.h             \
-       $(top_srcdir)/libgimp/gimpaspectpreview.c       \
-       $(top_srcdir)/libgimp/gimpaspectpreview.h       \
-       $(top_srcdir)/libgimp/gimpbrushselectbutton.c   \
-       $(top_srcdir)/libgimp/gimpbrushselectbutton.h   \
-       $(top_srcdir)/libgimp/gimpdrawablepreview.c     \
-       $(top_srcdir)/libgimp/gimpdrawablepreview.h     \
-       $(top_srcdir)/libgimp/gimpexport.c              \
-       $(top_srcdir)/libgimp/gimpexport.h              \
-       $(top_srcdir)/libgimp/gimpfontselectbutton.c    \
-       $(top_srcdir)/libgimp/gimpfontselectbutton.h    \
-       $(top_srcdir)/libgimp/gimpgradientselectbutton.c\
-       $(top_srcdir)/libgimp/gimpgradientselectbutton.h\
-       $(top_srcdir)/libgimp/gimpimagecombobox.c       \
-       $(top_srcdir)/libgimp/gimpimagecombobox.h       \
-       $(top_srcdir)/libgimp/gimpimagemetadata.c       \
-       $(top_srcdir)/libgimp/gimpimagemetadata.h       \
-       $(top_srcdir)/libgimp/gimpitemcombobox.c        \
-       $(top_srcdir)/libgimp/gimpitemcombobox.h        \
-       $(top_srcdir)/libgimp/gimppaletteselectbutton.c \
-       $(top_srcdir)/libgimp/gimppaletteselectbutton.h \
-       $(top_srcdir)/libgimp/gimppatternselectbutton.c \
-       $(top_srcdir)/libgimp/gimppatternselectbutton.h \
-       $(top_srcdir)/libgimp/gimpprocbrowserdialog.c   \
-       $(top_srcdir)/libgimp/gimpprocbrowserdialog.h   \
-       $(top_srcdir)/libgimp/gimpprocview.c            \
-       $(top_srcdir)/libgimp/gimpprocview.h            \
-       $(top_srcdir)/libgimp/gimpprogressbar.c         \
-       $(top_srcdir)/libgimp/gimpprogressbar.h         \
-       $(top_srcdir)/libgimp/gimpselectbutton.c        \
-       $(top_srcdir)/libgimp/gimpselectbutton.h        \
-       $(top_srcdir)/libgimp/gimpzoompreview.c         \
-       $(top_srcdir)/libgimp/gimpzoompreview.h
+       ../libgimp/gimpui.c                     \
+       ../libgimp/gimpui.h                     \
+       ../libgimp/gimpuitypes.h                \
+       ../libgimp/gimpaspectpreview.c          \
+       ../libgimp/gimpaspectpreview.h          \
+       ../libgimp/gimpbrushselectbutton.c      \
+       ../libgimp/gimpbrushselectbutton.h      \
+       ../libgimp/gimpdrawablepreview.c        \
+       ../libgimp/gimpdrawablepreview.h        \
+       ../libgimp/gimpexport.c         \
+       ../libgimp/gimpexport.h         \
+       ../libgimp/gimpfontselectbutton.c       \
+       ../libgimp/gimpfontselectbutton.h       \
+       ../libgimp/gimpgradientselectbutton.c\
+       ../libgimp/gimpgradientselectbutton.h\
+       ../libgimp/gimpimagecombobox.c  \
+       ../libgimp/gimpimagecombobox.h  \
+       ../libgimp/gimpimagemetadata.c  \
+       ../libgimp/gimpimagemetadata.h  \
+       ../libgimp/gimpitemcombobox.c   \
+       ../libgimp/gimpitemcombobox.h   \
+       ../libgimp/gimppaletteselectbutton.c    \
+       ../libgimp/gimppaletteselectbutton.h    \
+       ../libgimp/gimppatternselectbutton.c    \
+       ../libgimp/gimppatternselectbutton.h    \
+       ../libgimp/gimpprocbrowserdialog.c      \
+       ../libgimp/gimpprocbrowserdialog.h      \
+       ../libgimp/gimpprocview.c               \
+       ../libgimp/gimpprocview.h               \
+       ../libgimp/gimpprogressbar.c            \
+       ../libgimp/gimpprogressbar.h            \
+       ../libgimp/gimpselectbutton.c   \
+       ../libgimp/gimpselectbutton.h   \
+       ../libgimp/gimpzoompreview.c            \
+       ../libgimp/gimpzoompreview.h
diff --git a/libgimpbase/Makefile.gi b/libgimpbase/Makefile.gi
index 58dda0d660..0cdcb21aca 100644
--- a/libgimpbase/Makefile.gi
+++ b/libgimpbase/Makefile.gi
@@ -1,35 +1,35 @@
 # Introspectable sources for libgimpbase
 
 libgimpbase_introspectable = \
-       $(top_srcdir)/libgimpbase/gimpbaseenums.h               \
-       $(top_srcdir)/libgimpbase/gimpbasetypes.h               \
-       $(top_srcdir)/libgimpbase/gimpbasetypes.c               \
-       $(top_srcdir)/libgimpbase/gimplimits.h                  \
-       $(top_builddir)/libgimpbase/gimpversion.h               \
+       ../libgimpbase/gimpbaseenums.h          \
+       ../libgimpbase/gimpbasetypes.h          \
+       ../libgimpbase/gimpbasetypes.c          \
+       ../libgimpbase/gimplimits.h                     \
+       ../libgimpbase/gimpversion.h            \
        \
-       $(top_srcdir)/libgimpbase/gimpchecks.c                  \
-       $(top_srcdir)/libgimpbase/gimpchecks.h                  \
-       $(top_srcdir)/libgimpbase/gimpcpuaccel.c                \
-       $(top_srcdir)/libgimpbase/gimpcpuaccel.h                \
-       $(top_srcdir)/libgimpbase/gimpenv.c                     \
-       $(top_srcdir)/libgimpbase/gimpenv.h                     \
-       $(top_srcdir)/libgimpbase/gimpmemsize.c                 \
-       $(top_srcdir)/libgimpbase/gimpmemsize.h                 \
-       $(top_srcdir)/libgimpbase/gimpmetadata.c                \
-       $(top_srcdir)/libgimpbase/gimpmetadata.h                \
-       $(top_srcdir)/libgimpbase/gimpparamspecs.c              \
-       $(top_srcdir)/libgimpbase/gimpparamspecs.h              \
-       $(top_srcdir)/libgimpbase/gimpparasite.c                \
-       $(top_srcdir)/libgimpbase/gimpparasite.h                \
-       $(top_srcdir)/libgimpbase/gimpparasiteio.c              \
-       $(top_srcdir)/libgimpbase/gimpparasiteio.h              \
-       $(top_srcdir)/libgimpbase/gimprectangle.c               \
-       $(top_srcdir)/libgimpbase/gimprectangle.h               \
-       $(top_srcdir)/libgimpbase/gimpsignal.c                  \
-       $(top_srcdir)/libgimpbase/gimpsignal.h                  \
-       $(top_srcdir)/libgimpbase/gimpunit.c                    \
-       $(top_srcdir)/libgimpbase/gimpunit.h                    \
-       $(top_srcdir)/libgimpbase/gimputils.c                   \
-       $(top_srcdir)/libgimpbase/gimputils.h                   \
-       $(top_srcdir)/libgimpbase/gimpvaluearray.c              \
-       $(top_srcdir)/libgimpbase/gimpvaluearray.h
+       ../libgimpbase/gimpchecks.c             \
+       ../libgimpbase/gimpchecks.h             \
+       ../libgimpbase/gimpcpuaccel.c           \
+       ../libgimpbase/gimpcpuaccel.h           \
+       ../libgimpbase/gimpenv.c                        \
+       ../libgimpbase/gimpenv.h                        \
+       ../libgimpbase/gimpmemsize.c                    \
+       ../libgimpbase/gimpmemsize.h                    \
+       ../libgimpbase/gimpmetadata.c           \
+       ../libgimpbase/gimpmetadata.h           \
+       ../libgimpbase/gimpparamspecs.c         \
+       ../libgimpbase/gimpparamspecs.h         \
+       ../libgimpbase/gimpparasite.c           \
+       ../libgimpbase/gimpparasite.h           \
+       ../libgimpbase/gimpparasiteio.c         \
+       ../libgimpbase/gimpparasiteio.h         \
+       ../libgimpbase/gimprectangle.c          \
+       ../libgimpbase/gimprectangle.h          \
+       ../libgimpbase/gimpsignal.c                     \
+       ../libgimpbase/gimpsignal.h                     \
+       ../libgimpbase/gimpunit.c                       \
+       ../libgimpbase/gimpunit.h                       \
+       ../libgimpbase/gimputils.c              \
+       ../libgimpbase/gimputils.h              \
+       ../libgimpbase/gimpvaluearray.c         \
+       ../libgimpbase/gimpvaluearray.h
diff --git a/libgimpcolor/Makefile.gi b/libgimpcolor/Makefile.gi
index 597274a27c..28d53ad60a 100644
--- a/libgimpcolor/Makefile.gi
+++ b/libgimpcolor/Makefile.gi
@@ -1,32 +1,32 @@
 # Introspectable sources for libgimpcolor
 
 libgimpcolor_introspectable_headers = \
-       $(top_srcdir)/libgimpcolor/gimpcolortypes.h             \
-       $(top_srcdir)/libgimpcolor/gimpadaptivesupersample.h    \
-       $(top_srcdir)/libgimpcolor/gimpbilinear.h               \
-       $(top_srcdir)/libgimpcolor/gimpcairo.h                  \
-       $(top_srcdir)/libgimpcolor/gimpcmyk.h                   \
-       $(top_srcdir)/libgimpcolor/gimpcolormanaged.h           \
-       $(top_srcdir)/libgimpcolor/gimpcolorprofile.h           \
-       $(top_srcdir)/libgimpcolor/gimpcolorspace.h             \
-       $(top_srcdir)/libgimpcolor/gimpcolortransform.h         \
-       $(top_srcdir)/libgimpcolor/gimphsl.h                    \
-       $(top_srcdir)/libgimpcolor/gimphsv.h                    \
-       $(top_srcdir)/libgimpcolor/gimppixbuf.h                 \
-       $(top_srcdir)/libgimpcolor/gimprgb.h
+       ../libgimpcolor/gimpcolortypes.h                \
+       ../libgimpcolor/gimpadaptivesupersample.h       \
+       ../libgimpcolor/gimpbilinear.h          \
+       ../libgimpcolor/gimpcairo.h                     \
+       ../libgimpcolor/gimpcmyk.h                      \
+       ../libgimpcolor/gimpcolormanaged.h              \
+       ../libgimpcolor/gimpcolorprofile.h              \
+       ../libgimpcolor/gimpcolorspace.h                \
+       ../libgimpcolor/gimpcolortransform.h            \
+       ../libgimpcolor/gimphsl.h                       \
+       ../libgimpcolor/gimphsv.h                       \
+       ../libgimpcolor/gimppixbuf.h                    \
+       ../libgimpcolor/gimprgb.h
 
 libgimpcolor_introspectable = \
-       $(top_srcdir)/libgimpcolor/gimpadaptivesupersample.c    \
-       $(top_srcdir)/libgimpcolor/gimpbilinear.c               \
-       $(top_srcdir)/libgimpcolor/gimpcairo.c                  \
-       $(top_srcdir)/libgimpcolor/gimpcmyk.c                   \
-       $(top_srcdir)/libgimpcolor/gimpcolormanaged.c           \
-       $(top_srcdir)/libgimpcolor/gimpcolorprofile.c           \
-       $(top_srcdir)/libgimpcolor/gimpcolorspace.c             \
-       $(top_srcdir)/libgimpcolor/gimpcolortransform.c         \
-       $(top_srcdir)/libgimpcolor/gimphsl.c                    \
-       $(top_srcdir)/libgimpcolor/gimphsv.c                    \
-       $(top_srcdir)/libgimpcolor/gimppixbuf.c                 \
-       $(top_srcdir)/libgimpcolor/gimprgb.c                    \
-       $(top_srcdir)/libgimpcolor/gimprgb-parse.c              \
+       ../libgimpcolor/gimpadaptivesupersample.c       \
+       ../libgimpcolor/gimpbilinear.c          \
+       ../libgimpcolor/gimpcairo.c                     \
+       ../libgimpcolor/gimpcmyk.c                      \
+       ../libgimpcolor/gimpcolormanaged.c              \
+       ../libgimpcolor/gimpcolorprofile.c              \
+       ../libgimpcolor/gimpcolorspace.c                \
+       ../libgimpcolor/gimpcolortransform.c            \
+       ../libgimpcolor/gimphsl.c                       \
+       ../libgimpcolor/gimphsv.c                       \
+       ../libgimpcolor/gimppixbuf.c                    \
+       ../libgimpcolor/gimprgb.c                       \
+       ../libgimpcolor/gimprgb-parse.c         \
        $(libgimpcolor_introspectable_headers)
diff --git a/libgimpconfig/Makefile.gi b/libgimpconfig/Makefile.gi
index 168b6638dd..db9a9d4dee 100644
--- a/libgimpconfig/Makefile.gi
+++ b/libgimpconfig/Makefile.gi
@@ -1,27 +1,27 @@
 # Introspectable sources for libgimpconfig
 
 libgimpconfig_introspectable_headers = \
-       $(top_srcdir)/libgimpconfig/gimpconfigenums.h           \
-       $(top_srcdir)/libgimpconfig/gimpconfigtypes.h           \
-       $(top_srcdir)/libgimpconfig/gimpconfig-iface.h          \
-       $(top_srcdir)/libgimpconfig/gimpconfig-deserialize.h    \
-       $(top_srcdir)/libgimpconfig/gimpconfig-error.h          \
-       $(top_srcdir)/libgimpconfig/gimpconfig-params.h         \
-       $(top_srcdir)/libgimpconfig/gimpconfig-path.h           \
-       $(top_srcdir)/libgimpconfig/gimpconfig-serialize.h      \
-       $(top_srcdir)/libgimpconfig/gimpconfig-utils.h          \
-       $(top_srcdir)/libgimpconfig/gimpconfigwriter.h          \
-       $(top_srcdir)/libgimpconfig/gimpscanner.h               \
-       $(top_srcdir)/libgimpconfig/gimpcolorconfig.h
+       ../libgimpconfig/gimpconfigenums.h              \
+       ../libgimpconfig/gimpconfigtypes.h              \
+       ../libgimpconfig/gimpconfig-iface.h             \
+       ../libgimpconfig/gimpconfig-deserialize.h       \
+       ../libgimpconfig/gimpconfig-error.h             \
+       ../libgimpconfig/gimpconfig-params.h            \
+       ../libgimpconfig/gimpconfig-path.h              \
+       ../libgimpconfig/gimpconfig-serialize.h \
+       ../libgimpconfig/gimpconfig-utils.h             \
+       ../libgimpconfig/gimpconfigwriter.h             \
+       ../libgimpconfig/gimpscanner.h          \
+       ../libgimpconfig/gimpcolorconfig.h
 
 libgimpconfig_introspectable = \
-       $(top_srcdir)/libgimpconfig/gimpconfig-iface.c          \
-       $(top_srcdir)/libgimpconfig/gimpconfig-deserialize.c    \
-       $(top_srcdir)/libgimpconfig/gimpconfig-error.c          \
-       $(top_srcdir)/libgimpconfig/gimpconfig-path.c           \
-       $(top_srcdir)/libgimpconfig/gimpconfig-serialize.c      \
-       $(top_srcdir)/libgimpconfig/gimpconfig-utils.c          \
-       $(top_srcdir)/libgimpconfig/gimpconfigwriter.c          \
-       $(top_srcdir)/libgimpconfig/gimpscanner.c               \
-       $(top_srcdir)/libgimpconfig/gimpcolorconfig.c           \
+       ../libgimpconfig/gimpconfig-iface.c             \
+       ../libgimpconfig/gimpconfig-deserialize.c       \
+       ../libgimpconfig/gimpconfig-error.c             \
+       ../libgimpconfig/gimpconfig-path.c              \
+       ../libgimpconfig/gimpconfig-serialize.c \
+       ../libgimpconfig/gimpconfig-utils.c             \
+       ../libgimpconfig/gimpconfigwriter.c             \
+       ../libgimpconfig/gimpscanner.c          \
+       ../libgimpconfig/gimpcolorconfig.c              \
        $(libgimpconfig_introspectable_headers)
diff --git a/libgimpmath/Makefile.gi b/libgimpmath/Makefile.gi
index 6ff978d7ef..6898b23b18 100644
--- a/libgimpmath/Makefile.gi
+++ b/libgimpmath/Makefile.gi
@@ -1,11 +1,11 @@
 # Introspectable sources for libgimpmath
 #
 libgimpmath_introspectable_headers = \
-       $(top_srcdir)/libgimpmath/gimpmathtypes.h       \
-       $(top_srcdir)/libgimpmath/gimpmatrix.h          \
-       $(top_srcdir)/libgimpmath/gimpvector.h
+       ../libgimpmath/gimpmathtypes.h  \
+       ../libgimpmath/gimpmatrix.h             \
+       ../libgimpmath/gimpvector.h
 
 libgimpmath_introspectable = \
-       $(top_srcdir)/libgimpmath/gimpmatrix.c          \
-       $(top_srcdir)/libgimpmath/gimpvector.c          \
+       ../libgimpmath/gimpmatrix.c             \
+       ../libgimpmath/gimpvector.c             \
        $(libgimpmath_introspectable_headers)
diff --git a/libgimpmodule/Makefile.gi b/libgimpmodule/Makefile.gi
index 0d23dc5e26..edca14e88b 100644
--- a/libgimpmodule/Makefile.gi
+++ b/libgimpmodule/Makefile.gi
@@ -1,11 +1,11 @@
 # Introspectable sources for libgimpmodule
 
 libgimpmodule_introspectable_headers = \
-       $(top_srcdir)/libgimpmodule/gimpmoduletypes.h   \
-       $(top_srcdir)/libgimpmodule/gimpmodule.h        \
-       $(top_srcdir)/libgimpmodule/gimpmoduledb.h
+       ../libgimpmodule/gimpmoduletypes.h      \
+       ../libgimpmodule/gimpmodule.h   \
+       ../libgimpmodule/gimpmoduledb.h
 
 libgimpmodule_introspectable = \
-       $(top_srcdir)/libgimpmodule/gimpmodule.c        \
-       $(top_srcdir)/libgimpmodule/gimpmoduledb.c      \
+       ../libgimpmodule/gimpmodule.c   \
+       ../libgimpmodule/gimpmoduledb.c \
        $(libgimpmodule_introspectable_headers)
diff --git a/libgimpthumb/Makefile.gi b/libgimpthumb/Makefile.gi
index b00e79719e..ea42ceeef3 100644
--- a/libgimpthumb/Makefile.gi
+++ b/libgimpthumb/Makefile.gi
@@ -1,14 +1,14 @@
 # Introspectable sources for libgimpthumb
 
 libgimpthumb_introspectable_headers =  \
-       $(top_srcdir)/libgimpthumb/gimpthumb-enums.h    \
-       $(top_srcdir)/libgimpthumb/gimpthumb-error.h    \
-       $(top_srcdir)/libgimpthumb/gimpthumb-types.h    \
-       $(top_srcdir)/libgimpthumb/gimpthumb-utils.h    \
-       $(top_srcdir)/libgimpthumb/gimpthumbnail.h
+       ../libgimpthumb/gimpthumb-enums.h       \
+       ../libgimpthumb/gimpthumb-error.h       \
+       ../libgimpthumb/gimpthumb-types.h       \
+       ../libgimpthumb/gimpthumb-utils.h       \
+       ../libgimpthumb/gimpthumbnail.h
 
 libgimpthumb_introspectable =  \
-       $(top_srcdir)/libgimpthumb/gimpthumb-error.c    \
-       $(top_srcdir)/libgimpthumb/gimpthumb-utils.c    \
-       $(top_srcdir)/libgimpthumb/gimpthumbnail.c      \
+       ../libgimpthumb/gimpthumb-error.c       \
+       ../libgimpthumb/gimpthumb-utils.c       \
+       ../libgimpthumb/gimpthumbnail.c \
        $(libgimpthumb_introspectable_headers)
diff --git a/libgimpwidgets/Makefile.gi b/libgimpwidgets/Makefile.gi
index 0c9ae7fae8..ac7eadd8fe 100644
--- a/libgimpwidgets/Makefile.gi
+++ b/libgimpwidgets/Makefile.gi
@@ -1,118 +1,118 @@
 libgimpwidgets_introspectable_headers =        \
-       $(top_srcdir)/libgimpwidgets/gimpbrowser.h                      \
-       $(top_srcdir)/libgimpwidgets/gimpbusybox.h                      \
-       $(top_srcdir)/libgimpwidgets/gimpbutton.h                       \
-       $(top_srcdir)/libgimpwidgets/gimpcairo-utils.h                  \
-       $(top_srcdir)/libgimpwidgets/gimpcellrenderercolor.h            \
-       $(top_srcdir)/libgimpwidgets/gimpcellrenderertoggle.h           \
-       $(top_srcdir)/libgimpwidgets/gimpchainbutton.h                  \
-       $(top_srcdir)/libgimpwidgets/gimpcolorarea.h                    \
-       $(top_srcdir)/libgimpwidgets/gimpcolorbutton.h                  \
-       $(top_srcdir)/libgimpwidgets/gimpcolordisplay.h                 \
-       $(top_srcdir)/libgimpwidgets/gimpcolordisplaystack.h            \
-       $(top_srcdir)/libgimpwidgets/gimpcolorhexentry.h                \
-       $(top_srcdir)/libgimpwidgets/gimpcolornotebook.h                \
-       $(top_srcdir)/libgimpwidgets/gimpcolorprofilechooserdialog.h    \
-       $(top_srcdir)/libgimpwidgets/gimpcolorprofilecombobox.h         \
-       $(top_srcdir)/libgimpwidgets/gimpcolorprofilestore.h            \
-       $(top_srcdir)/libgimpwidgets/gimpcolorprofileview.h             \
-##     $(top_srcdir)/libgimpwidgets/gimpcolorscale.h
-##     $(top_srcdir)/libgimpwidgets/gimpcolorscales.h
-##     $(top_srcdir)/libgimpwidgets/gimpcolorselect.h
-       $(top_srcdir)/libgimpwidgets/gimpcolorselection.h               \
-       $(top_srcdir)/libgimpwidgets/gimpcolorselector.h                \
-       $(top_srcdir)/libgimpwidgets/gimpdialog.h                       \
-       $(top_srcdir)/libgimpwidgets/gimpenumcombobox.h                 \
-       $(top_srcdir)/libgimpwidgets/gimpenumlabel.h                    \
-       $(top_srcdir)/libgimpwidgets/gimpenumstore.h                    \
-       $(top_srcdir)/libgimpwidgets/gimpenumwidgets.h                  \
-       $(top_srcdir)/libgimpwidgets/gimpfileentry.h                    \
-       $(top_srcdir)/libgimpwidgets/gimpframe.h                        \
-       $(top_srcdir)/libgimpwidgets/gimphelpui.h                       \
-       $(top_srcdir)/libgimpwidgets/gimphintbox.h                      \
-       $(top_srcdir)/libgimpwidgets/gimpicons.h                        \
-       $(top_srcdir)/libgimpwidgets/gimpintcombobox.h                  \
-       $(top_srcdir)/libgimpwidgets/gimpintstore.h                     \
-       $(top_srcdir)/libgimpwidgets/gimpmemsizeentry.h                 \
-       $(top_srcdir)/libgimpwidgets/gimpnumberpairentry.h              \
-       $(top_srcdir)/libgimpwidgets/gimpoffsetarea.h                   \
-       $(top_srcdir)/libgimpwidgets/gimppageselector.h                 \
-       $(top_srcdir)/libgimpwidgets/gimppatheditor.h                   \
-       $(top_srcdir)/libgimpwidgets/gimppickbutton.h                   \
-       $(top_srcdir)/libgimpwidgets/gimppreview.h                      \
-       $(top_srcdir)/libgimpwidgets/gimppreviewarea.h                  \
-       $(top_srcdir)/libgimpwidgets/gimppropwidgets.h                  \
-       $(top_srcdir)/libgimpwidgets/gimpquerybox.h                     \
-       $(top_srcdir)/libgimpwidgets/gimpruler.h                        \
-       $(top_srcdir)/libgimpwidgets/gimpscaleentry.h                   \
-       $(top_srcdir)/libgimpwidgets/gimpscrolledpreview.h              \
-       $(top_srcdir)/libgimpwidgets/gimpsizeentry.h                    \
-       $(top_srcdir)/libgimpwidgets/gimpspinbutton.h                   \
-       $(top_srcdir)/libgimpwidgets/gimpstringcombobox.h               \
-       $(top_srcdir)/libgimpwidgets/gimpunitcombobox.h                 \
-       $(top_srcdir)/libgimpwidgets/gimpunitstore.h                    \
-       $(top_srcdir)/libgimpwidgets/gimpwidgets-error.h                \
-       $(top_srcdir)/libgimpwidgets/gimpwidgets.h                      \
-       $(top_srcdir)/libgimpwidgets/gimpwidgetsenums.h                 \
-       $(top_srcdir)/libgimpwidgets/gimpwidgetstypes.h                 \
-       $(top_srcdir)/libgimpwidgets/gimpwidgetsutils.h                 \
-       $(top_srcdir)/libgimpwidgets/gimpzoommodel.h
+       ../libgimpwidgets/gimpbrowser.h                 \
+       ../libgimpwidgets/gimpbusybox.h                 \
+       ../libgimpwidgets/gimpbutton.h                  \
+       ../libgimpwidgets/gimpcairo-utils.h                     \
+       ../libgimpwidgets/gimpcellrenderercolor.h               \
+       ../libgimpwidgets/gimpcellrenderertoggle.h              \
+       ../libgimpwidgets/gimpchainbutton.h                     \
+       ../libgimpwidgets/gimpcolorarea.h                       \
+       ../libgimpwidgets/gimpcolorbutton.h                     \
+       ../libgimpwidgets/gimpcolordisplay.h                    \
+       ../libgimpwidgets/gimpcolordisplaystack.h               \
+       ../libgimpwidgets/gimpcolorhexentry.h           \
+       ../libgimpwidgets/gimpcolornotebook.h           \
+       ../libgimpwidgets/gimpcolorprofilechooserdialog.h       \
+       ../libgimpwidgets/gimpcolorprofilecombobox.h            \
+       ../libgimpwidgets/gimpcolorprofilestore.h               \
+       ../libgimpwidgets/gimpcolorprofileview.h                \
+##     ../libgimpwidgets/gimpcolorscale.h
+##     ../libgimpwidgets/gimpcolorscales.h
+##     ../libgimpwidgets/gimpcolorselect.h
+       ../libgimpwidgets/gimpcolorselection.h                  \
+       ../libgimpwidgets/gimpcolorselector.h                   \
+       ../libgimpwidgets/gimpdialog.h                  \
+       ../libgimpwidgets/gimpenumcombobox.h                    \
+       ../libgimpwidgets/gimpenumlabel.h                       \
+       ../libgimpwidgets/gimpenumstore.h                       \
+       ../libgimpwidgets/gimpenumwidgets.h                     \
+       ../libgimpwidgets/gimpfileentry.h                       \
+       ../libgimpwidgets/gimpframe.h                   \
+       ../libgimpwidgets/gimphelpui.h                  \
+       ../libgimpwidgets/gimphintbox.h                 \
+       ../libgimpwidgets/gimpicons.h                   \
+       ../libgimpwidgets/gimpintcombobox.h                     \
+       ../libgimpwidgets/gimpintstore.h                        \
+       ../libgimpwidgets/gimpmemsizeentry.h                    \
+       ../libgimpwidgets/gimpnumberpairentry.h                 \
+       ../libgimpwidgets/gimpoffsetarea.h                      \
+       ../libgimpwidgets/gimppageselector.h                    \
+       ../libgimpwidgets/gimppatheditor.h                      \
+       ../libgimpwidgets/gimppickbutton.h                      \
+       ../libgimpwidgets/gimppreview.h                 \
+       ../libgimpwidgets/gimppreviewarea.h                     \
+       ../libgimpwidgets/gimppropwidgets.h                     \
+       ../libgimpwidgets/gimpquerybox.h                        \
+       ../libgimpwidgets/gimpruler.h                   \
+       ../libgimpwidgets/gimpscaleentry.h                      \
+       ../libgimpwidgets/gimpscrolledpreview.h                 \
+       ../libgimpwidgets/gimpsizeentry.h                       \
+       ../libgimpwidgets/gimpspinbutton.h                      \
+       ../libgimpwidgets/gimpstringcombobox.h                  \
+       ../libgimpwidgets/gimpunitcombobox.h                    \
+       ../libgimpwidgets/gimpunitstore.h                       \
+       ../libgimpwidgets/gimpwidgets-error.h                   \
+       ../libgimpwidgets/gimpwidgets.h                 \
+       ../libgimpwidgets/gimpwidgetsenums.h                    \
+       ../libgimpwidgets/gimpwidgetstypes.h                    \
+       ../libgimpwidgets/gimpwidgetsutils.h                    \
+       ../libgimpwidgets/gimpzoommodel.h
 
 libgimpwidgets_introspectable =        \
-       $(top_srcdir)/libgimpwidgets/gimpbrowser.c                      \
-       $(top_srcdir)/libgimpwidgets/gimpbusybox.c                      \
-       $(top_srcdir)/libgimpwidgets/gimpbutton.c                       \
-       $(top_srcdir)/libgimpwidgets/gimpcairo-utils.c                  \
-       $(top_srcdir)/libgimpwidgets/gimpcellrenderercolor.c            \
-       $(top_srcdir)/libgimpwidgets/gimpcellrenderertoggle.c           \
-       $(top_srcdir)/libgimpwidgets/gimpchainbutton.c                  \
-       $(top_srcdir)/libgimpwidgets/gimpcolorarea.c                    \
-       $(top_srcdir)/libgimpwidgets/gimpcolorbutton.c                  \
-       $(top_srcdir)/libgimpwidgets/gimpcolordisplay.c                 \
-       $(top_srcdir)/libgimpwidgets/gimpcolordisplaystack.c            \
-       $(top_srcdir)/libgimpwidgets/gimpcolorhexentry.c                \
-       $(top_srcdir)/libgimpwidgets/gimpcolornotebook.c                \
-       $(top_srcdir)/libgimpwidgets/gimpcolorprofilechooserdialog.c    \
-       $(top_srcdir)/libgimpwidgets/gimpcolorprofilecombobox.c         \
-       $(top_srcdir)/libgimpwidgets/gimpcolorprofilestore.c            \
-       $(top_srcdir)/libgimpwidgets/gimpcolorprofileview.c             \
-##     $(top_srcdir)/libgimpwidgets/gimpcolorscale.c
-##     $(top_srcdir)/libgimpwidgets/gimpcolorscales.c
-##     $(top_srcdir)/libgimpwidgets/gimpcolorselect.c
-       $(top_srcdir)/libgimpwidgets/gimpcolorselection.c               \
-       $(top_srcdir)/libgimpwidgets/gimpcolorselector.c                \
-       $(top_srcdir)/libgimpwidgets/gimpdialog.c                       \
-       $(top_srcdir)/libgimpwidgets/gimpenumcombobox.c                 \
-       $(top_srcdir)/libgimpwidgets/gimpenumlabel.c                    \
-       $(top_srcdir)/libgimpwidgets/gimpenumstore.c                    \
-       $(top_srcdir)/libgimpwidgets/gimpenumwidgets.c                  \
-       $(top_srcdir)/libgimpwidgets/gimpfileentry.c                    \
-       $(top_srcdir)/libgimpwidgets/gimpframe.c                        \
-       $(top_srcdir)/libgimpwidgets/gimphelpui.c                       \
-       $(top_srcdir)/libgimpwidgets/gimphintbox.c                      \
-       $(top_srcdir)/libgimpwidgets/gimpicons.c                        \
-       $(top_srcdir)/libgimpwidgets/gimpintcombobox.c                  \
-       $(top_srcdir)/libgimpwidgets/gimpintstore.c                     \
-       $(top_srcdir)/libgimpwidgets/gimpmemsizeentry.c                 \
-       $(top_srcdir)/libgimpwidgets/gimpnumberpairentry.c              \
-       $(top_srcdir)/libgimpwidgets/gimpoffsetarea.c                   \
-       $(top_srcdir)/libgimpwidgets/gimppageselector.c                 \
-       $(top_srcdir)/libgimpwidgets/gimppatheditor.c                   \
-       $(top_srcdir)/libgimpwidgets/gimppickbutton.c                   \
-       $(top_srcdir)/libgimpwidgets/gimppreview.c                      \
-       $(top_srcdir)/libgimpwidgets/gimppreviewarea.c                  \
-       $(top_srcdir)/libgimpwidgets/gimppropwidgets.c                  \
-       $(top_srcdir)/libgimpwidgets/gimpquerybox.c                     \
-       $(top_srcdir)/libgimpwidgets/gimpruler.c                        \
-       $(top_srcdir)/libgimpwidgets/gimpscaleentry.c                   \
-       $(top_srcdir)/libgimpwidgets/gimpscrolledpreview.c              \
-       $(top_srcdir)/libgimpwidgets/gimpsizeentry.c                    \
-       $(top_srcdir)/libgimpwidgets/gimpspinbutton.c                   \
-       $(top_srcdir)/libgimpwidgets/gimpstringcombobox.c               \
-       $(top_srcdir)/libgimpwidgets/gimpunitcombobox.c                 \
-       $(top_srcdir)/libgimpwidgets/gimpunitstore.c                    \
-       $(top_srcdir)/libgimpwidgets/gimpwidgets-error.c                \
-       $(top_srcdir)/libgimpwidgets/gimpwidgets.c                      \
-       $(top_srcdir)/libgimpwidgets/gimpwidgetsutils.c                 \
-       $(top_srcdir)/libgimpwidgets/gimpzoommodel.c                    \
+       ../libgimpwidgets/gimpbrowser.c                 \
+       ../libgimpwidgets/gimpbusybox.c                 \
+       ../libgimpwidgets/gimpbutton.c                  \
+       ../libgimpwidgets/gimpcairo-utils.c                     \
+       ../libgimpwidgets/gimpcellrenderercolor.c               \
+       ../libgimpwidgets/gimpcellrenderertoggle.c              \
+       ../libgimpwidgets/gimpchainbutton.c                     \
+       ../libgimpwidgets/gimpcolorarea.c                       \
+       ../libgimpwidgets/gimpcolorbutton.c                     \
+       ../libgimpwidgets/gimpcolordisplay.c                    \
+       ../libgimpwidgets/gimpcolordisplaystack.c               \
+       ../libgimpwidgets/gimpcolorhexentry.c           \
+       ../libgimpwidgets/gimpcolornotebook.c           \
+       ../libgimpwidgets/gimpcolorprofilechooserdialog.c       \
+       ../libgimpwidgets/gimpcolorprofilecombobox.c            \
+       ../libgimpwidgets/gimpcolorprofilestore.c               \
+       ../libgimpwidgets/gimpcolorprofileview.c                \
+##     ../libgimpwidgets/gimpcolorscale.c
+##     ../libgimpwidgets/gimpcolorscales.c
+##     ../libgimpwidgets/gimpcolorselect.c
+       ../libgimpwidgets/gimpcolorselection.c          \
+       ../libgimpwidgets/gimpcolorselector.c           \
+       ../libgimpwidgets/gimpdialog.c                  \
+       ../libgimpwidgets/gimpenumcombobox.c                    \
+       ../libgimpwidgets/gimpenumlabel.c                       \
+       ../libgimpwidgets/gimpenumstore.c                       \
+       ../libgimpwidgets/gimpenumwidgets.c                     \
+       ../libgimpwidgets/gimpfileentry.c                       \
+       ../libgimpwidgets/gimpframe.c                   \
+       ../libgimpwidgets/gimphelpui.c                  \
+       ../libgimpwidgets/gimphintbox.c                 \
+       ../libgimpwidgets/gimpicons.c                   \
+       ../libgimpwidgets/gimpintcombobox.c                     \
+       ../libgimpwidgets/gimpintstore.c                        \
+       ../libgimpwidgets/gimpmemsizeentry.c                    \
+       ../libgimpwidgets/gimpnumberpairentry.c         \
+       ../libgimpwidgets/gimpoffsetarea.c                      \
+       ../libgimpwidgets/gimppageselector.c                    \
+       ../libgimpwidgets/gimppatheditor.c                      \
+       ../libgimpwidgets/gimppickbutton.c                      \
+       ../libgimpwidgets/gimppreview.c                 \
+       ../libgimpwidgets/gimppreviewarea.c                     \
+       ../libgimpwidgets/gimppropwidgets.c                     \
+       ../libgimpwidgets/gimpquerybox.c                        \
+       ../libgimpwidgets/gimpruler.c                   \
+       ../libgimpwidgets/gimpscaleentry.c                      \
+       ../libgimpwidgets/gimpscrolledpreview.c         \
+       ../libgimpwidgets/gimpsizeentry.c                       \
+       ../libgimpwidgets/gimpspinbutton.c                      \
+       ../libgimpwidgets/gimpstringcombobox.c          \
+       ../libgimpwidgets/gimpunitcombobox.c                    \
+       ../libgimpwidgets/gimpunitstore.c                       \
+       ../libgimpwidgets/gimpwidgets-error.c           \
+       ../libgimpwidgets/gimpwidgets.c                 \
+       ../libgimpwidgets/gimpwidgetsutils.c                    \
+       ../libgimpwidgets/gimpzoommodel.c                       \
        $(libgimpwidgets_introspectable_headers)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]