[gimp] libgimp: fix missing installed headers.

[Jehan <jehanp src gnome org>]

commit 6fe24fcb0b7acdb807cb05464b5a48d05a11389d
Author: Jehan <jehan girinstud io>
Date:   Fri Aug 9 22:38:25 2019 +0200

    libgimp: fix missing installed headers.
    
    While doing so, better break the various source categories in libgimp/.
    Otherwise we were duplicating some of the header list, hence we forgot
    to install some of the headers.

 libgimp/Makefile.am | 42 ++------------------------
 libgimp/Makefile.gi | 86 ++++++++++++++++++++++++++++-------------------------
 2 files changed, 49 insertions(+), 79 deletions(-)
---
diff --git a/libgimp/Makefile.am b/libgimp/Makefile.am
index 76728d29ec..080fd9ae51 100644
--- a/libgimp/Makefile.am
+++ b/libgimp/Makefile.am
@@ -155,45 +155,9 @@ libgimpui_@GIMP_API_VERSION@_la_SOURCES = \
        $(libgimpui_sources)
 
 gimpinclude_HEADERS = \
-       gimp.h                          \
-       gimptypes.h                     \
-       gimpenums.h                     \
-       ${PDB_WRAPPERS_H}               \
-       gimpbrushselect.h               \
-       gimpchannel.h                   \
-       gimpdrawable.h                  \
-       gimpfontselect.h                \
-       gimpgimprc.h                    \
-       gimpgradientselect.h            \
-       gimpimage.h                     \
-       gimpimagecolorprofile.h         \
-       gimplayer.h                     \
-       gimplegacy.h                    \
-       gimppaletteselect.h             \
-       gimpparamspecs.h                \
-       gimppatternselect.h             \
-       gimpplugin.h                    \
-       gimpprogress.h                  \
-       gimpselection.h                 \
-       \
-       gimpui.h                        \
-       gimpuitypes.h                   \
-       gimpaspectpreview.h             \
-       gimpbrushselectbutton.h         \
-       gimpdrawablepreview.h           \
-       gimpexport.h                    \
-       gimpfontselectbutton.h          \
-       gimpgradientselectbutton.h      \
-       gimpimagecombobox.h             \
-       gimpimagemetadata.h             \
-       gimpitemcombobox.h              \
-       gimppaletteselectbutton.h       \
-       gimppatternselectbutton.h       \
-       gimpprocbrowserdialog.h         \
-       gimpprocview.h                  \
-       gimpprogressbar.h               \
-       gimpselectbutton.h              \
-       gimpzoompreview.h
+       $(libgimp_introspectable_headers)       \
+       gimplegacy.h                            \
+       $(libgimpui_introspectable_headers)
 
 libgimp_@GIMP_API_VERSION@_la_LDFLAGS = \
        -version-info $(LT_VERSION_INFO)        \
diff --git a/libgimp/Makefile.gi b/libgimp/Makefile.gi
index 32c96cb91a..8d3438bb40 100644
--- a/libgimp/Makefile.gi
+++ b/libgimp/Makefile.gi
@@ -104,82 +104,88 @@ PDB_WRAPPERS_H = \
 libgimp_built_sources = \
        gimpenums.c
 
-libgimp_introspectable = \
-       $(libgimp_built_sources)                \
-       ../libgimp/gimp.c                       \
+libgimp_introspectable_headers = \
        ../libgimp/gimp.h                       \
        ../libgimp/gimptypes.h                  \
        ../libgimp/gimpenums.h                  \
-       ${PDB_WRAPPERS_C}                       \
        ${PDB_WRAPPERS_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 = \
-       ../libgimp/gimpui.c                     \
+libgimp_introspectable = \
+       $(libgimp_introspectable_headers)       \
+       $(libgimp_built_sources)                \
+       ../libgimp/gimp.c                       \
+       ${PDB_WRAPPERS_C}                       \
+       ../libgimp/gimpbrushselect.c            \
+       ../libgimp/gimpchannel.c                \
+       ../libgimp/gimpdrawable.c               \
+       ../libgimp/gimpfontselect.c             \
+       ../libgimp/gimpgimprc.c                 \
+       ../libgimp/gimpgradientselect.c         \
+       ../libgimp/gimpimage.c                  \
+       ../libgimp/gimpimagecolorprofile.c      \
+       ../libgimp/gimplayer.c                  \
+       ../libgimp/gimppaletteselect.c          \
+       ../libgimp/gimpparamspecs.c             \
+       ../libgimp/gimppatternselect.c          \
+       ../libgimp/gimppdb.c                    \
+       ../libgimp/gimpplugin.c                 \
+       ../libgimp/gimpprocedure.c              \
+       ../libgimp/gimpprogress.c               \
+       ../libgimp/gimpselection.c
+
+libgimpui_introspectable_headers = \
        ../libgimp/gimpui.h                     \
        ../libgimp/gimpuitypes.h                \
+       ../libgimp/gimpaspectpreview.h          \
+       ../libgimp/gimpbrushselectbutton.h      \
+       ../libgimp/gimpdrawablepreview.h        \
+       ../libgimp/gimpexport.h                 \
+       ../libgimp/gimpfontselectbutton.h       \
+       ../libgimp/gimpgradientselectbutton.h   \
+       ../libgimp/gimpimagecombobox.h          \
+       ../libgimp/gimpimagemetadata.h          \
+       ../libgimp/gimpitemcombobox.h           \
+       ../libgimp/gimppaletteselectbutton.h    \
+       ../libgimp/gimppatternselectbutton.h    \
+       ../libgimp/gimpprocbrowserdialog.h      \
+       ../libgimp/gimpprocview.h               \
+       ../libgimp/gimpprogressbar.h            \
+       ../libgimp/gimpselectbutton.h           \
+       ../libgimp/gimpzoompreview.h
+
+libgimpui_introspectable = \
+       $(libgimpui_introspectable_headers)     \
+       ../libgimp/gimpui.c                     \
        ../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
+       ../libgimp/gimpzoompreview.c