[gimp] app, icons, libgimpwidgets: fix icon's gresources rules.

[Jehan <jehanp src gnome org>]

commit c872dcbf20db37c5817c6c77d7e473468915fbc3
Author: Jehan <jehan girinstud io>
Date:   Mon Jan 31 21:33:34 2022 +0100

    app, icons, libgimpwidgets: fix icon's gresources rules.
    
    Now the source images are in the build dirs.
    
    Also:
    - clean the EXTRA_DIST contents on autotools;
    - add dependencies rules in meson gresources to make sure icons are
      built before resource build;
    - finally remove a duplicate build rule in Color Makefile.

 app/core/Makefile.am       |  4 ++--
 icons/Color/Makefile.am    | 21 +++------------------
 icons/Color/meson.build    |  4 ++++
 icons/Symbolic/Makefile.am | 18 +++---------------
 libgimpwidgets/Makefile.am |  4 ++--
 5 files changed, 14 insertions(+), 37 deletions(-)
---
diff --git a/app/core/Makefile.am b/app/core/Makefile.am
index 86fbb4f920..c9439abc4c 100644
--- a/app/core/Makefile.am
+++ b/app/core/Makefile.am
@@ -569,10 +569,10 @@ $(srcdir)/core-enums.c: xgen-cec
 
 gimp-core-pixbufs.h: $(top_builddir)/icons/Color/gimp-core-pixbufs.gresource.xml
        $(AM_V_GEN) $(HOST_GLIB_COMPILE_RESOURCES) \
-         --sourcedir=$(top_srcdir)/icons/Color --generate-header \
+         --sourcedir=$(top_builddir)/icons/Color --generate-header \
          --target=$@ $(top_builddir)/icons/Color/gimp-core-pixbufs.gresource.xml
 
 gimp-core-pixbufs.c: gimp-core-pixbufs.h
        $(AM_V_GEN) $(HOST_GLIB_COMPILE_RESOURCES) \
-         --sourcedir=$(top_srcdir)/icons/Color --generate-source \
+         --sourcedir=$(top_builddir)/icons/Color --generate-source \
          --target=$@ $(top_builddir)/icons/Color/gimp-core-pixbufs.gresource.xml
diff --git a/icons/Color/Makefile.am b/icons/Color/Makefile.am
index 420de4eadf..0adf7327cb 100644
--- a/icons/Color/Makefile.am
+++ b/icons/Color/Makefile.am
@@ -26,9 +26,6 @@ endif
 16/%.png: scalable/%.svg ../../tools/colorsvg2png
        mkdir -p $(@D) && \
        $(top_builddir)/tools/colorsvg2png $< $@ $(@D)
-16/%.png: scalable/%.svg ../../tools/colorsvg2png
-       mkdir -p $(@D) && \
-       $(top_builddir)/tools/colorsvg2png $< $@ $(@D)
 18/%.png: scalable/%.svg ../../tools/colorsvg2png
        mkdir -p $(@D) && \
        $(top_builddir)/tools/colorsvg2png $< $@ $(@D)
@@ -72,21 +69,9 @@ ICON_IMAGES = \
        64/gimp-wilber-eek.png
 
 EXTRA_DIST = \
-       $(icons_DATA)                   \
-       $(icons12_images)               \
-       $(icons16_images)               \
-       $(icons18_images)               \
-       $(icons20_images)               \
-       $(icons22_images)               \
-       $(icons24_images)               \
-       $(icons32_images)               \
-       $(icons48_images)               \
-       $(icons64_images)               \
-       $(icons64_system_images)        \
-       $(icons96_images)               \
-       $(icons128_images)              \
-       $(icons192_images)              \
-       $(icons256_images)              \
+       $(icons_DATA)           \
+       64/gimp-frame.png       \
+       64/gimp-texture.png     \
        $(scalable_images)      \
        color-scalable.svg
 
diff --git a/icons/Color/meson.build b/icons/Color/meson.build
index 51db0c9168..ebeb3b76cb 100644
--- a/icons/Color/meson.build
+++ b/icons/Color/meson.build
@@ -120,6 +120,8 @@ icons_core_sources = gnome.compile_resources(
   resourcename,
   xml_file,
   c_name: resourcename.underscorify(),
+  dependencies: icon_dialog_question,
+  source_dir: [meson.current_build_dir()]
 )
 
 
@@ -142,4 +144,6 @@ icons_imgs_sources = gnome.compile_resources(
   resourcename,
   xml_file,
   c_name: resourcename.underscorify(),
+  dependencies: icon_wilber_eek,
+  source_dir: [meson.current_build_dir()]
 )
diff --git a/icons/Symbolic/Makefile.am b/icons/Symbolic/Makefile.am
index ecb8045d39..fb491b61dc 100644
--- a/icons/Symbolic/Makefile.am
+++ b/icons/Symbolic/Makefile.am
@@ -69,20 +69,8 @@ endif
 
 
 EXTRA_DIST = \
-       $(icons_DATA)                   \
-       $(icons12_images)               \
-       $(icons16_images)               \
-       $(icons18_images)               \
-       $(icons20_images)               \
-       $(icons22_images)               \
-       $(icons24_images)               \
-       $(icons32_images)               \
-       $(icons48_images)               \
-       $(icons64_images)               \
-       $(icons64_system_images)        \
-       $(icons96_images)               \
-       $(icons128_images)              \
-       $(icons192_images)              \
-       $(icons256_images)              \
+       $(icons_DATA)           \
+       64/gimp-frame.png       \
+       64/gimp-texture.png     \
        $(scalable_images)      \
        symbolic-scalable.svg
diff --git a/libgimpwidgets/Makefile.am b/libgimpwidgets/Makefile.am
index 9e34c9d34f..f395f05ef1 100644
--- a/libgimpwidgets/Makefile.am
+++ b/libgimpwidgets/Makefile.am
@@ -224,12 +224,12 @@ gimp-color-picker-cursors.c: gimp-color-picker-cursors.h
 
 gimp-icon-pixbufs.h: $(top_builddir)/icons/Color/gimp-icon-pixbufs.gresource.xml
        $(AM_V_GEN) $(HOST_GLIB_COMPILE_RESOURCES) \
-         --sourcedir=$(top_srcdir)/icons/Color --generate-header \
+         --sourcedir=$(top_builddir)/icons/Color --generate-header \
          --target=$@ $(top_builddir)/icons/Color/gimp-icon-pixbufs.gresource.xml
 
 gimp-icon-pixbufs.c: gimp-icon-pixbufs.h
        $(AM_V_GEN) $(HOST_GLIB_COMPILE_RESOURCES) \
-         --sourcedir=$(top_srcdir)/icons/Color --generate-source \
+         --sourcedir=$(top_builddir)/icons/Color --generate-source \
          --target=$@ $(top_builddir)/icons/Color/gimp-icon-pixbufs.gresource.xml