[gtk/gtk-3-24: 10/13] gtk: Include emoji data when using autotools and msvc build systems

[Matthias Clasen <matthiasc src gnome org>]

commit a1aecd26d55a5d133a10d916f662779879d294e5
Author: Marco Trevisan (Treviño) <mail 3v1n0 net>
Date:   Thu May 6 04:53:13 2021 +0200

    gtk: Include emoji data when using autotools and msvc build systems
    
    Differently from the meson case, here we just include the emoji data
    files into the global gresources file, get_emoji_data() supports this
    and it's just easier to handle in these build systems.

 gtk/Makefile.am             | 14 +++++++++++---
 win32/create-lists-msvc.mak |  2 +-
 win32/generate-msvc.mak     |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index c9d644decd..074fb35f40 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1355,7 +1355,10 @@ gtk.gresource.xml: Makefile.am inspector/Makefile.inc
          echo "    <file compressed='true' preprocess='xml-stripblanks'>inspector/$$n</file>" >> $@; \
        done; \
        echo "    <file>inspector/logo.png</file>" >> $@; \
-       echo "    <file>emoji/emoji.data</file>" >> $@; \
+       for f in $(srcdir)/emoji/*.data; do \
+         n=`basename $$f`; \
+         echo "    <file>emoji/$$n</file>" >> $@; \
+       done; \
        echo "  </gresource>" >> $@; \
        echo "</gresources>" >> $@;
 
@@ -1743,8 +1746,13 @@ EXTRA_DIST +=                   \
        $(gsettings_SCHEMAS)    \
        compose/compose-parse.py        \
        emoji/convert-emoji.c   \
-       emoji/emoji.json        \
-       emoji/emoji1.json       \
+       emoji/gresource.xml.in  \
+       emoji/README.md \
+       emoji/de.data   \
+       emoji/en.data   \
+       emoji/es.data   \
+       emoji/fr.data   \
+       emoji/zh.data   \
        a11y/Makefile.inc       \
        deprecated/Makefile.inc \
        glade/README.glade      \
diff --git a/win32/create-lists-msvc.mak b/win32/create-lists-msvc.mak
index 925cadd2c7..c53c29f10e 100644
--- a/win32/create-lists-msvc.mak
+++ b/win32/create-lists-msvc.mak
@@ -71,7 +71,7 @@ NULL=
 !if [for %s in (scalable) do @(for %c in (status) do @(for %f in (..\gtk\icons\%s\%c\*.svg) do @call 
create-lists.bat file resources_sources.mak %f))]
 !endif
 
-!if [for %f in (..\gtk\inspector\*.ui ..\gtk\inspector\logo.png ..\gtk\emoji\emoji.data) do @call 
create-lists.bat file resources_sources.mak %f]
+!if [for %f in (..\gtk\inspector\*.ui ..\gtk\inspector\logo.png ..\gtk\emoji\*.data) do @call 
create-lists.bat file resources_sources.mak %f]
 !endif
 
 !if [call create-lists.bat footer resources_sources.mak]
diff --git a/win32/generate-msvc.mak b/win32/generate-msvc.mak
index d579d150bb..4fb0c563e6 100644
--- a/win32/generate-msvc.mak
+++ b/win32/generate-msvc.mak
@@ -156,7 +156,7 @@ all:        \
        @for %%s in (scalable) do @(for %%c in (status) do @(for %%f in (..\gtk\icons\%%s\%%c\*.svg) do @echo 
    ^<file^>icons/%%s/%%c/%%~nxf^</file^>>> $@))
        @for %%f in (..\gtk\inspector\*.ui) do @echo     ^<file compressed='true' 
preprocess='xml-stripblanks'^>inspector/%%~nxf^</file^>>> $@
        @echo     ^<file^>inspector/logo.png^</file^>>> $@
-       @echo     ^<file^>emoji/emoji.data^</file^>>> $@
+       @for %%f in (..\gtk\emoji\*.data) do @echo     ^<file^>emoji/%%~nxf^</file^>>> $@
        @echo   ^</gresource^>>> $@
        @echo ^</gresources^>>> $@