[gimp] libgimp, libgimpbase: both introspectable under same namespace Gimp.

From: Jehan <jehanp src gnome org>
To: commits-list gnome org
Cc:
Subject: [gimp] libgimp, libgimpbase: both introspectable under same namespace Gimp.
Date: Thu, 25 Jul 2019 08:52:31 +0000 (UTC)
commit 6389bb4b585950e88676053efe4978760ef02393
Author: Jehan <jehan girinstud io>
Date:   Thu Jul 25 10:30:00 2019 +0200

    libgimp, libgimpbase: both introspectable under same namespace Gimp.
    
    At first I thought these could be different namespaces, but actually
    GObject Introspection parses files and can only use (AFAICS) the
    namespace actually used in our C function, which is always `gimp_` (and
    not `gimpbase_` or whatever.
    
    So make the introspection at the root level, and it will include all
    libgimp* libraries in one namespace, same as the C lib anyway. For now
    only libgimp and libgimpbase as I am still testing.
    Also I move the introspectable sources in their own file in order to
    share the list between the library building Makefile and the GI
    makefile because I can't find how to pass over variables otherwise.

 Makefile.am             |  45 +++++++++++
 libgimp/Makefile.am     | 194 +++---------------------------------------------
 libgimp/Makefile.gi     | 185 +++++++++++++++++++++++++++++++++++++++++++++
 libgimpbase/Makefile.am |  82 ++++----------------
 libgimpbase/Makefile.gi |  34 +++++++++
 5 files changed, 289 insertions(+), 251 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 915facdcc4..203e38298b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -168,3 +168,48 @@ 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)/libgimpbase/Makefile.gi
+include $(top_srcdir)/libgimp/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: libgimpbase/libgimpbase-@GIMP_API_VERSION@.la 
libgimp/libgimp-@GIMP_API_VERSION@.la libgimp/libgimpui-@GIMP_API_VERSION@.la Makefile
+Gimp_@GIMP_API_MAJOR_VERSION@_@GIMP_API_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 GLib-2.0
+Gimp_@GIMP_API_MAJOR_VERSION@_@GIMP_API_MINOR_VERSION@_gir_CFLAGS = \
+       -DGIMP_BASE_COMPILATION \
+       -DGIMP_COMPILATION      \
+       $(AM_CFLAGS)            \
+       $(AM_CPPFLAGS)          \
+       -I$(top_builddir)       \
+       -I$(top_srcdir)         \
+       $(CAIRO_CFLAGS)         \
+       $(GDK_PIXBUF_CFLAGS)    \
+       $(GEGL_CFLAGS)          \
+       $(GTK_CFLAGS)
+
+Gimp_@GIMP_API_MAJOR_VERSION@_@GIMP_API_MINOR_VERSION@_gir_LIBS = \
+       libgimpbase/libgimpbase-@GIMP_API_VERSION@.la   \
+       libgimp/libgimp-@GIMP_API_VERSION@.la           \
+       libgimp/libgimpui-@GIMP_API_VERSION@.la
+
+Gimp_@GIMP_API_MAJOR_VERSION@_@GIMP_API_MINOR_VERSION@_gir_FILES =     \
+       $(libgimpbase_introspectable)                                   \
+       $(libgimp_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 5446d911f3..df17810098 100644
--- a/libgimp/Makefile.am
+++ b/libgimp/Makefile.am
@@ -90,157 +90,17 @@ AM_LDFLAGS = \
 
 lib_LTLIBRARIES = libgimp-@GIMP_API_VERSION@.la libgimpui-@GIMP_API_VERSION@.la
 
-PDB_WRAPPERS_C = \
-       gimp_pdb.c                      \
-       gimpbrush_pdb.c                 \
-       gimpbrushes_pdb.c               \
-       gimpbrushselect_pdb.c           \
-       gimpbuffer_pdb.c                \
-       gimpchannel_pdb.c               \
-       gimpcontext_pdb.c               \
-       gimpdebug_pdb.c                 \
-       gimpdisplay_pdb.c               \
-       gimpdrawable_pdb.c              \
-       gimpdrawablecolor_pdb.c         \
-       gimpdrawableedit_pdb.c          \
-       gimpdynamics_pdb.c              \
-       gimpedit_pdb.c                  \
-       gimpfileops_pdb.c               \
-       gimpfloatingsel_pdb.c           \
-       gimpfonts_pdb.c                 \
-       gimpfontselect_pdb.c            \
-       gimpgimprc_pdb.c                \
-       gimpgradient_pdb.c              \
-       gimpgradients_pdb.c             \
-       gimpgradientselect_pdb.c        \
-       gimphelp_pdb.c                  \
-       gimpimage_pdb.c                 \
-       gimpimagecolorprofile_pdb.c     \
-       gimpimageconvert_pdb.c          \
-       gimpimagegrid_pdb.c             \
-       gimpimageguides_pdb.c           \
-       gimpimagesamplepoints_pdb.c     \
-       gimpimageselect_pdb.c           \
-       gimpimagetransform_pdb.c        \
-       gimpimageundo_pdb.c             \
-       gimpitem_pdb.c                  \
-       gimpitemtransform_pdb.c         \
-       gimplayer_pdb.c                 \
-       gimpmessage_pdb.c               \
-       gimppainttools_pdb.c            \
-       gimppalette_pdb.c               \
-       gimppalettes_pdb.c              \
-       gimppaletteselect_pdb.c         \
-       gimppattern_pdb.c               \
-       gimppatterns_pdb.c              \
-       gimppatternselect_pdb.c         \
-       gimpplugin_pdb.c                \
-       gimpproceduraldb_pdb.c          \
-       gimpprogress_pdb.c              \
-       gimpselection_pdb.c             \
-       gimptextlayer_pdb.c             \
-       gimptexttool_pdb.c              \
-       gimpunit_pdb.c                  \
-       gimpvectors_pdb.c
-
-PDB_WRAPPERS_H = \
-       gimp_pdb_headers.h              \
-       gimp_pdb.h                      \
-       gimpbrush_pdb.h                 \
-       gimpbrushes_pdb.h               \
-       gimpbrushselect_pdb.h           \
-       gimpbuffer_pdb.h                \
-       gimpchannel_pdb.h               \
-       gimpcontext_pdb.h               \
-       gimpdebug_pdb.h                 \
-       gimpdisplay_pdb.h               \
-       gimpdrawable_pdb.h              \
-       gimpdrawablecolor_pdb.h         \
-       gimpdrawableedit_pdb.h          \
-       gimpdynamics_pdb.h              \
-       gimpedit_pdb.h                  \
-       gimpfileops_pdb.h               \
-       gimpfloatingsel_pdb.h           \
-       gimpfonts_pdb.h                 \
-       gimpfontselect_pdb.h            \
-       gimpgimprc_pdb.h                \
-       gimpgradient_pdb.h              \
-       gimpgradients_pdb.h             \
-       gimpgradientselect_pdb.h        \
-       gimphelp_pdb.h                  \
-       gimpimage_pdb.h                 \
-       gimpimagecolorprofile_pdb.h     \
-       gimpimageconvert_pdb.h          \
-       gimpimagegrid_pdb.h             \
-       gimpimageguides_pdb.h           \
-       gimpimagesamplepoints_pdb.h     \
-       gimpimageselect_pdb.h           \
-       gimpimagetransform_pdb.h        \
-       gimpimageundo_pdb.h             \
-       gimpitem_pdb.h                  \
-       gimpitemtransform_pdb.h         \
-       gimplayer_pdb.h                 \
-       gimpmessage_pdb.h               \
-       gimppainttools_pdb.h            \
-       gimppalette_pdb.h               \
-       gimppalettes_pdb.h              \
-       gimppaletteselect_pdb.h         \
-       gimppattern_pdb.h               \
-       gimppatterns_pdb.h              \
-       gimppatternselect_pdb.h         \
-       gimpplugin_pdb.h                \
-       gimpproceduraldb_pdb.h          \
-       gimpprogress_pdb.h              \
-       gimpselection_pdb.h             \
-       gimptextlayer_pdb.h             \
-       gimptexttool_pdb.h              \
-       gimpunit_pdb.h                  \
-       gimpvectors_pdb.h
+# Add all sources which are introspectable in this file for reuse.
+AUTOMAKE_OPTIONS = subdir-objects
+include $(top_srcdir)/libgimp/Makefile.gi
 
 libgimp_sources = \
-       gimp.c                  \
-       gimp.h                  \
-       gimptypes.h             \
-       gimpenums.h             \
-       ${PDB_WRAPPERS_C}       \
-       ${PDB_WRAPPERS_H}       \
-       gimpbrushselect.c       \
-       gimpbrushselect.h       \
-       gimpchannel.c           \
-       gimpchannel.h           \
-       gimpdrawable.c          \
-       gimpdrawable.h          \
-       gimpfontselect.c        \
-       gimpfontselect.h        \
-       gimpgimprc.c            \
-       gimpgimprc.h            \
-       gimpgradientselect.c    \
-       gimpgradientselect.h    \
-       gimpimage.c             \
-       gimpimage.h             \
-       gimpimagecolorprofile.c \
-       gimpimagecolorprofile.h \
-       gimplayer.c             \
-       gimplayer.h             \
-       gimppaletteselect.c     \
-       gimppaletteselect.h     \
-       gimppatternselect.c     \
-       gimppatternselect.h     \
-       gimppixbuf.c            \
-       gimppixbuf.h            \
-       gimpplugin.c            \
-       gimpplugin.h            \
-       gimpproceduraldb.c      \
-       gimpproceduraldb.h      \
-       gimpprogress.c          \
-       gimpprogress.h          \
-       gimpselection.c         \
-       gimpselection.h         \
-       gimptilebackendplugin.c \
-       gimptilebackendplugin.h \
-       gimpunitcache.c         \
-       gimpunitcache.h         \
-       stdplugins-intl.h       \
+       $(libgimp_introspectable)       \
+       gimptilebackendplugin.c         \
+       gimptilebackendplugin.h         \
+       gimpunitcache.c                 \
+       gimpunitcache.h                 \
+       stdplugins-intl.h               \
        libgimp-intl.h
 
 libgimp_built_sources = \
@@ -253,41 +113,7 @@ libgimp_@GIMP_API_VERSION@_la_SOURCES = \
        $(libgimp_sources)
 
 libgimpui_sources = \
-       gimpui.c                        \
-       gimpui.h                        \
-       gimpuitypes.h                   \
-       gimpaspectpreview.c             \
-       gimpaspectpreview.h             \
-       gimpbrushselectbutton.c         \
-       gimpbrushselectbutton.h         \
-       gimpdrawablepreview.c           \
-       gimpdrawablepreview.h           \
-       gimpexport.c                    \
-       gimpexport.h                    \
-       gimpfontselectbutton.c          \
-       gimpfontselectbutton.h          \
-       gimpgradientselectbutton.c      \
-       gimpgradientselectbutton.h      \
-       gimpimagecombobox.c             \
-       gimpimagecombobox.h             \
-       gimpimagemetadata.c             \
-       gimpimagemetadata.h             \
-       gimpitemcombobox.c              \
-       gimpitemcombobox.h              \
-       gimppaletteselectbutton.c       \
-       gimppaletteselectbutton.h       \
-       gimppatternselectbutton.c       \
-       gimppatternselectbutton.h       \
-       gimpprocbrowserdialog.c         \
-       gimpprocbrowserdialog.h         \
-       gimpprocview.c                  \
-       gimpprocview.h                  \
-       gimpprogressbar.c               \
-       gimpprogressbar.h               \
-       gimpselectbutton.c              \
-       gimpselectbutton.h              \
-       gimpzoompreview.c               \
-       gimpzoompreview.h
+       $(libgimpui_introspectable)
 
 libgimpui_built_sources = \
        gimpuimarshal.c                 \
diff --git a/libgimp/Makefile.gi b/libgimp/Makefile.gi
new file mode 100644
index 0000000000..a97f3268c6
--- /dev/null
+++ b/libgimp/Makefile.gi
@@ -0,0 +1,185 @@
+# 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/gimpplugin_pdb.c                  \
+       $(top_srcdir)/libgimp/gimpproceduraldb_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/gimpunit_pdb.c                    \
+       $(top_srcdir)/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/gimpplugin_pdb.h                  \
+       $(top_srcdir)/libgimp/gimpproceduraldb_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/gimpunit_pdb.h                    \
+       $(top_srcdir)/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               \
+       ${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/gimppatternselect.c       \
+       $(top_srcdir)/libgimp/gimppatternselect.h       \
+       $(top_srcdir)/libgimp/gimppixbuf.c              \
+       $(top_srcdir)/libgimp/gimppixbuf.h              \
+       $(top_srcdir)/libgimp/gimpplugin.c              \
+       $(top_srcdir)/libgimp/gimpplugin.h              \
+       $(top_srcdir)/libgimp/gimpproceduraldb.c        \
+       $(top_srcdir)/libgimp/gimpproceduraldb.h        \
+       $(top_srcdir)/libgimp/gimpprogress.c            \
+       $(top_srcdir)/libgimp/gimpprogress.h            \
+       $(top_srcdir)/libgimp/gimpselection.c           \
+       $(top_srcdir)/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
diff --git a/libgimpbase/Makefile.am b/libgimpbase/Makefile.am
index 6936182b2c..860bf53639 100644
--- a/libgimpbase/Makefile.am
+++ b/libgimpbase/Makefile.am
@@ -90,54 +90,25 @@ lib_LTLIBRARIES = libgimpbase-@GIMP_API_VERSION@.la
 ../libgimpbase/gimpversion.h: gimpversion.h
        @:
 
+# Add all sources which are introspectable in this file for reuse.
+AUTOMAKE_OPTIONS = subdir-objects
+include $(top_srcdir)/libgimpbase/Makefile.gi
 
-libgimpbase_introspectable = \
-       gimpbase.h              \
-       gimpbaseenums.h         \
-       gimpcompatenums.h       \
-       gimpbasetypes.h         \
-       gimpbasetypes.c         \
-       gimplimits.h            \
-       gimpparam.h             \
-       gimpversion.h           \
+libgimpbase_sources = \
+       $(libgimpbase_introspectable)   \
+       gimpbase.h                      \
+       gimpcompatenums.h               \
        \
-       gimpbase-private.c      \
-       gimpbase-private.h      \
-       gimpchecks.c            \
-       gimpchecks.h            \
-       gimpcpuaccel.c          \
-       gimpcpuaccel.h          \
-       gimpenv.c               \
-       gimpenv.h               \
-       gimpmemsize.c           \
-       gimpmemsize.h           \
-       gimpmetadata.c          \
-       gimpmetadata.h          \
-       gimpparasite.c          \
-       gimpparasite.h          \
-       gimpparasiteio.c        \
-       gimpparasiteio.h        \
-       gimpprotocol.c          \
-       gimpprotocol.h          \
-       gimprectangle.c         \
-       gimprectangle.h         \
-       gimpreloc.c             \
-       gimpreloc.h             \
-       gimpsignal.c            \
-       gimpsignal.h            \
-       gimpunit.c              \
-       gimpunit.h              \
-       gimputils.c             \
-       gimputils.h             \
-       gimpvaluearray.c        \
-       gimpvaluearray.h        \
-       gimpwire.c              \
+       gimpbase-private.c              \
+       gimpbase-private.h              \
+       gimpprotocol.c                  \
+       gimpprotocol.h                  \
+       gimpreloc.c                     \
+       gimpreloc.h                     \
+       gimpwin32-io.h                  \
+       gimpwire.c                      \
        gimpwire.h
 
-libgimpbase_sources = \
-       gimpwin32-io.h          \
-       $(libgimpbase_introspectable)
-
 libgimpbase_built_sources = \
        gimpbaseenums.c         \
        gimpcompatenums.c
@@ -262,26 +233,3 @@ $(srcdir)/gimpcompatenums.c: xgen-cec
        fi
 
 DISTCLEANFILES = gimpversion.h
-
-### GObject introspection
-
--include $(INTROSPECTION_MAKEFILE)
-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: libgimpbase-@GIMP_API_VERSION@.la Makefile
-Gimp_@GIMP_API_MAJOR_VERSION@_@GIMP_API_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 GLib-2.0
-Gimp_@GIMP_API_MAJOR_VERSION@_@GIMP_API_MINOR_VERSION@_gir_CFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) 
-I$(top_builddir) -I$(top_srcdir)
-Gimp_@GIMP_API_MAJOR_VERSION@_@GIMP_API_MINOR_VERSION@_gir_LIBS = libgimpbase-@GIMP_API_VERSION@.la
-Gimp_@GIMP_API_MAJOR_VERSION@_@GIMP_API_MINOR_VERSION@_gir_FILES = $(libgimpbase_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/libgimpbase/Makefile.gi b/libgimpbase/Makefile.gi
new file mode 100644
index 0000000000..09153d79bc
--- /dev/null
+++ b/libgimpbase/Makefile.gi
@@ -0,0 +1,34 @@
+# 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_srcdir)/libgimpbase/gimpparam.h                   \
+       $(top_builddir)/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/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
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]