dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Jehan 2022-01-31 21:33:34 +01:00
parent 5a93168a96
commit c872dcbf20
5 changed files with 14 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/core/Makefile.am
View File

@ -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

21
icons/Color/Makefile.am
View File

@ -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

4
icons/Color/meson.build
View File

@ -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()]
)

18
icons/Symbolic/Makefile.am
View File

@ -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

4
libgimpwidgets/Makefile.am
View File

@ -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