[gnome-robots: 4/4] Merge branch 'meson' into 'master'



commit 34cb3a08186e78cf633251cc368bf1db622ebe23
Merge: 2eb4203 1144709
Author: Michael Catanzaro <mcatanzaro posteo net>
Date:   Sun Jan 27 16:20:20 2019 +0000

    Merge branch 'meson' into 'master'
    
    Switch to meson & ditch autotools
    
    See merge request GNOME/gnome-robots!3

 .gitignore                                         |   1 +
 Makefile.am                                        |  10 -
 autogen.sh                                         |  46 ----
 build-aux/meson_post_install.py                    |  14 +
 configure.ac                                       |  72 -----
 data/Makefile.am                                   |  86 ------
 data/{ => cursors}/cursor-down-left.png            | Bin
 data/{ => cursors}/cursor-down-right.png           | Bin
 data/{ => cursors}/cursor-down.png                 | Bin
 data/{ => cursors}/cursor-hold.png                 | Bin
 data/{ => cursors}/cursor-left.png                 | Bin
 data/{ => cursors}/cursor-right.png                | Bin
 data/{ => cursors}/cursor-up-left.png              | Bin
 data/{ => cursors}/cursor-up-right.png             | Bin
 data/{ => cursors}/cursor-up.png                   | Bin
 data/{ => games}/classic_robots.cfg                |   0
 data/{ => games}/nightmare.cfg                     |   0
 data/{ => games}/robots2.cfg                       |   0
 data/{ => games}/robots2_easy.cfg                  |   0
 data/{ => games}/robots_with_safe_teleport.cfg     |   0
 data/icons/Makefile.am                             |   3 -
 .../{gnome-robots.png => org.gnome.Robots.png}     | Bin
 .../{gnome-robots.png => org.gnome.Robots.png}     | Bin
 .../{gnome-robots.png => org.gnome.Robots.png}     | Bin
 .../{gnome-robots.png => org.gnome.Robots.png}     | Bin
 .../{gnome-robots.png => org.gnome.Robots.png}     | Bin
 data/icons/hicolor/Makefile.am                     |  21 --
 ...-symbolic.svg => org.gnome.Robots-symbolic.svg} |   0
 .../{gnome-robots.svg => org.gnome.Robots.svg}     |   0
 data/icons/meson.build                             |  24 ++
 data/meson.build                                   |  99 +++++++
 ...data.xml.in => org.gnome.Robots.appdata.xml.in} |  10 +-
 ...bots.desktop.in => org.gnome.Robots.desktop.in} |   2 +-
 ...ts.gschema.xml => org.gnome.Robots.gschema.xml} |   2 +-
 data/{ => pixmaps}/aieee.png                       | Bin
 data/{ => pixmaps}/splat.png                       | Bin
 data/{ => pixmaps}/yahoo.png                       | Bin
 data/{ => sounds}/die.ogg                          | Bin
 data/{ => sounds}/splat.ogg                        | Bin
 data/{ => sounds}/teleport.ogg                     | Bin
 data/{ => sounds}/victory.ogg                      | Bin
 data/{ => sounds}/yahoo.ogg                        | Bin
 data/{ => themes}/anthills.png                     | Bin
 data/{ => themes}/boo.svg                          |   0
 data/{ => themes}/cows.png                         | Bin
 data/{ => themes}/eggs.png                         | Bin
 data/{ => themes}/gnomes.png                       | Bin
 data/{ => themes}/mice.png                         | Bin
 data/{ => themes}/robots.svg                       |   0
 data/{ => themes}/spills.png                       | Bin
 data/{ => themes}/stormclouds.png                  | Bin
 data/{ => themes}/toasters.png                     | Bin
 data/{ => themes}/ufo.svg                          |   0
 git.mk                                             | 303 ---------------------
 help/LINGUAS                                       |  18 ++
 help/Makefile.am                                   |  43 ---
 help/meson.build                                   |  43 +++
 meson.build                                        |  36 +++
 po/Makevars                                        |  78 ------
 po/POTFILES.in                                     |   6 +-
 po/meson.build                                     |   1 +
 src/Makefile.am                                    |  64 -----
 src/gnome-robots.c                                 |   8 +-
 ...ts.gresource.xml => gnome-robots.gresource.xml} |   2 +-
 src/meson.build                                    |  44 +++
 65 files changed, 297 insertions(+), 739 deletions(-)
---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]