[gimp] icons: more exceptions in icon generation.

[Jehan Pagès <jehanp src gnome org>]

commit 684c196bcd59a373bcfe9312f8749a9d87427738
Author: Jehan <jehan girinstud io>
Date:   Sun Feb 14 02:00:38 2016 +0100

    icons: more exceptions in icon generation.
    
    gimp-toilet-paper must not be inverted and gimp-color-picker-white|black
    must be inverted from respectively gimp-color-picker-black|white.

 icons/Symbolic-Inverted/Makefile.am |   29 ++++++++++++++++++++++++-----
 1 files changed, 24 insertions(+), 5 deletions(-)
---
diff --git a/icons/Symbolic-Inverted/Makefile.am b/icons/Symbolic-Inverted/Makefile.am
index 9f1d1ff..471722a 100644
--- a/icons/Symbolic-Inverted/Makefile.am
+++ b/icons/Symbolic-Inverted/Makefile.am
@@ -7,12 +7,31 @@ icons_DATA = \
 
 include $(top_srcdir)/icons/Symbolic/icon-list.mk
 
-# As an exception, we do not want to invert gimp-default-colors.
-# Just use it as-is.
+# As exceptions, we do not want to invert some icons.
+# Just use these as-is: gimp-default-colors, gimp-toilet-paper.png.
 12/gimp-default-colors.png: $(top_srcdir)/icons/Symbolic/12/gimp-default-colors.png
-       mkdir -p `dirname $<`
-       cp -f $< $@
+       mkdir -p `dirname $<` && cp -f $< $@
+scalable/gimp-default-colors.svg: ../Symbolic/scalable/gimp-default-colors.svg
+       mkdir -p `dirname $<` && cp -f $< $@
+
+%/gimp-toilet-paper.png: $(top_srcdir)/icons/Symbolic/%/gimp-toilet-paper.png
+       mkdir -p `dirname $<` && cp -f $< $@
+scalable/gimp-toilet-paper.svg: ../Symbolic/scalable/gimp-toilet-paper.svg
+       mkdir -p `dirname $<` && cp -f $< $@
+
+# Other exceptions: inverted gimp-color-picker-white|black are generated
+# from each other.
+18/gimp-color-picker-black.png: $(top_srcdir)/icons/Symbolic/18/gimp-color-picker-white.png
+       $(MAKE_ICON)
+scalable/gimp-color-picker-black.svg: $(top_builddir)/icons/Symbolic/scalable/gimp-color-picker-white.svg
+       mkdir -p scalable && $(top_builddir)/tools/invert-svg $< $@
+
+18/gimp-color-picker-white.png: $(top_srcdir)/icons/Symbolic/18/gimp-color-picker-black.png
+       $(MAKE_ICON)
+scalable/gimp-color-picker-white.svg: $(top_builddir)/icons/Symbolic/scalable/gimp-color-picker-black.svg
+       mkdir -p scalable && $(top_builddir)/tools/invert-svg $< $@
 
+# Rule for all other scalable icons.
 scalable/%.svg: ../Symbolic/scalable/%.svg ../../tools/invert-svg
        mkdir -p scalable && \
        $(top_builddir)/tools/invert-svg $< $@
@@ -31,7 +50,7 @@ MAKE_ICON = mkdir -p `dirname $ `; \
          <node operation='gegl:invert-gamma'></node> \
          <node operation='gegl:load'> \
            <params> \
-             <param name='path'>$(top_srcdir)/icons/Symbolic/$@</param> \
+             <param name='path'>$<</param> \
            </params> \
          </node> \
        </gegl>" -o $@