[mutter] build: Move data files to their dedicated subfolder

[Rico Tzschichholz <ricotz src gnome org>]

commit ec8ba4b5f9700fed31295233c05d5906e8f6e9d9
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Thu Jun 5 10:50:15 2014 +0200

    build: Move data files to their dedicated subfolder

 .cvsignore                                         |   35 ------------------
 .gitignore                                         |   27 +++++---------
 Makefile.am                                        |    9 ++++-
 configure.ac                                       |    1 +
 {src => data}/50-mutter-navigation.xml.in          |    0
 {src => data}/50-mutter-system.xml.in              |    0
 {src => data}/50-mutter-windows.xml.in             |    0
 data/Makefile.am                                   |   37 ++++++++++++++++++-
 {src => data}/default_icon.png                     |  Bin 1184 -> 1184 bytes
 {src => data}/mutter-schemas.convert               |    0
 {src => data}/mutter-wayland.desktop.in            |    0
 {src => data}/mutter.desktop.in                    |    0
 {src => data}/org.gnome.mutter.gschema.xml.in      |    0
 .../org.gnome.mutter.wayland.gschema.xml.in        |    0
 po/POTFILES.in                                     |   12 +++---
 po/POTFILES.skip                                   |    3 +-
 src/Makefile.am                                    |   33 -----------------
 17 files changed, 59 insertions(+), 98 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 446c092..c2b89a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,11 +19,11 @@ libtool
 ltmain.sh
 missing
 .deps
-src/50-mutter-navigation.xml
-src/50-mutter-system.xml
-src/50-mutter-windows.xml
-src/mutter.desktop
-src/mutter-wayland.desktop
+data/50-mutter-navigation.xml
+data/50-mutter-system.xml
+data/50-mutter-windows.xml
+data/mutter.desktop
+data/mutter-wayland.desktop
 *.o
 *.a
 *.lo
@@ -32,10 +32,6 @@ src/mutter-wayland.desktop
 *.swp
 *.gir
 *.typelib
-tidy-enum-types.[ch]
-tidy-marshal.[ch]
-stamp-tidy-enum-types.h
-stamp-tidy-marshal.h
 stamp-h1
 *.gmo
 *.make
@@ -44,14 +40,12 @@ stamp-it
 .intltool-merge-cache
 POTFILES
 po/*.pot
-50-metacity-desktop-key.xml
-50-metacity-key.xml
 libmutter.pc
 mutter
-org.gnome.mutter.gschema.valid
-org.gnome.mutter.gschema.xml
-org.gnome.mutter.wayland.gschema.valid
-org.gnome.mutter.wayland.gschema.xml
+data/org.gnome.mutter.gschema.valid
+data/org.gnome.mutter.gschema.xml
+data/org.gnome.mutter.wayland.gschema.valid
+data/org.gnome.mutter.wayland.gschema.xml
 testasyncgetprop
 testboxes
 testgradient
@@ -66,9 +60,6 @@ test-focus
 test-gravity
 test-resizing
 test-size-hints
-# We can't say just "wm-tester" here or it will ignore the directory
-# rather than the binary
-src/wm-tester/wm-tester
 INSTALL
 mkinstalldirs
 src/mutter-enum-types.[ch]
diff --git a/Makefile.am b/Makefile.am
index 931d367..97e6fa6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,13 @@
 
-SUBDIRS=src po doc
+SUBDIRS = data src po doc
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
-DISTCLEANFILES = intltool-extract intltool-merge intltool-update po/stamp-it po/.intltool-merge-cache
+DISTCLEANFILES = \
+       intltool-extract \
+       intltool-merge \
+       intltool-update \
+       po/stamp-it \
+       po/.intltool-merge-cache
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
diff --git a/configure.ac b/configure.ac
index 77000ac..ead3257 100644
--- a/configure.ac
+++ b/configure.ac
@@ -379,6 +379,7 @@ changequote([,])dnl
 
 AC_CONFIG_FILES([
 Makefile
+data/Makefile
 doc/Makefile
 doc/man/Makefile
 doc/reference/Makefile
diff --git a/src/50-mutter-navigation.xml.in b/data/50-mutter-navigation.xml.in
similarity index 100%
rename from src/50-mutter-navigation.xml.in
rename to data/50-mutter-navigation.xml.in
diff --git a/src/50-mutter-system.xml.in b/data/50-mutter-system.xml.in
similarity index 100%
rename from src/50-mutter-system.xml.in
rename to data/50-mutter-system.xml.in
diff --git a/src/50-mutter-windows.xml.in b/data/50-mutter-windows.xml.in
similarity index 100%
rename from src/50-mutter-windows.xml.in
rename to data/50-mutter-windows.xml.in
diff --git a/data/Makefile.am b/data/Makefile.am
index 58f5900..2c11822 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,3 +1,36 @@
-defaultcursordir = $(pkgdatadir)/cursors
+desktopfiles_in_files = \
+       mutter.desktop.in \
+       mutter-wayland.desktop.in
+desktopfilesdir = $(datadir)/applications
+desktopfiles_DATA = $(desktopfiles_in_files:.desktop.in=.desktop)
 
-dist_defaultcursor_DATA = left_ptr.png
+ INTLTOOL_DESKTOP_RULE@
+
+xml_in_files = \
+        50-mutter-navigation.xml.in \
+        50-mutter-system.xml.in \
+        50-mutter-windows.xml.in
+xmldir = $(GNOME_KEYBINDINGS_KEYSDIR)
+xml_DATA = $(xml_in_files:.xml.in=.xml)
+
+gschema_in_files = \
+       org.gnome.mutter.gschema.xml.in \
+       org.gnome.mutter.wayland.gschema.xml.in
+gsettings_SCHEMAS = $(gschema_in_files:.xml.in=.xml)
+
+ INTLTOOL_XML_NOMERGE_RULE@
+ GSETTINGS_RULES@
+
+convertdir = $(datadir)/GConf/gsettings
+convert_DATA = mutter-schemas.convert
+
+CLEANFILES = \
+       $(desktopfiles_DATA) \
+       $(gsettings_SCHEMAS) \
+       $(xml_DATA)
+
+EXTRA_DIST = \
+       $(convert_DATA) \
+       $(desktopfiles_in_files) \
+       $(gschema_in_files) \
+       $(xml_in_files)
diff --git a/src/mutter-schemas.convert b/data/mutter-schemas.convert
similarity index 100%
rename from src/mutter-schemas.convert
rename to data/mutter-schemas.convert
diff --git a/src/mutter-wayland.desktop.in b/data/mutter-wayland.desktop.in
similarity index 100%
rename from src/mutter-wayland.desktop.in
rename to data/mutter-wayland.desktop.in
diff --git a/src/mutter.desktop.in b/data/mutter.desktop.in
similarity index 100%
rename from src/mutter.desktop.in
rename to data/mutter.desktop.in
diff --git a/src/org.gnome.mutter.gschema.xml.in b/data/org.gnome.mutter.gschema.xml.in
similarity index 100%
rename from src/org.gnome.mutter.gschema.xml.in
rename to data/org.gnome.mutter.gschema.xml.in
diff --git a/src/org.gnome.mutter.wayland.gschema.xml.in b/data/org.gnome.mutter.wayland.gschema.xml.in
similarity index 100%
rename from src/org.gnome.mutter.wayland.gschema.xml.in
rename to data/org.gnome.mutter.wayland.gschema.xml.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2ad0e18..4d8d353 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,8 +1,11 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-src/50-mutter-navigation.xml.in
-src/50-mutter-system.xml.in
-src/50-mutter-windows.xml.in
+data/50-mutter-navigation.xml.in
+data/50-mutter-system.xml.in
+data/50-mutter-windows.xml.in
+data/mutter.desktop.in
+data/org.gnome.mutter.gschema.xml.in
+data/org.gnome.mutter.wayland.gschema.xml.in
 src/backends/meta-monitor-manager.c
 src/compositor/compositor.c
 src/compositor/meta-background.c
@@ -18,9 +21,6 @@ src/core/prefs.c
 src/core/screen.c
 src/core/util.c
 src/core/window.c
-src/mutter.desktop.in
-src/org.gnome.mutter.gschema.xml.in
-src/org.gnome.mutter.wayland.gschema.xml.in
 src/ui/frames.c
 src/ui/resizepopup.c
 src/ui/theme.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 388d2ad..f0b9572 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,2 +1 @@
-src/metacity.schemas.in
-src/mutter-wayland.desktop.in
+data/mutter-wayland.desktop.in
diff --git a/src/Makefile.am b/src/Makefile.am
index 9867be4..fdd0334 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -345,51 +345,18 @@ testboxes_LDADD = $(MUTTER_LIBS) libmutter.la
 testgradient_LDADD = $(MUTTER_LIBS) libmutter.la
 testasyncgetprop_LDADD = $(MUTTER_LIBS) libmutter.la
 
- INTLTOOL_DESKTOP_RULE@
-
-desktopfilesdir=$(datadir)/applications
-desktopfiles_in_files=mutter.desktop.in
-desktopfiles_files=$(desktopfiles_in_files:.desktop.in=.desktop)
-desktopfiles_DATA = $(desktopfiles_files)
-
-xmldir       = $(GNOME_KEYBINDINGS_KEYSDIR)
-xml_in_files = \
-        50-mutter-navigation.xml.in    \
-        50-mutter-system.xml.in                \
-        50-mutter-windows.xml.in
-xml_DATA     = $(xml_in_files:.xml.in=.xml)
-
 dbus_idle_built_sources = meta-dbus-idle-monitor.c meta-dbus-idle-monitor.h
 
-gsettings_SCHEMAS = org.gnome.mutter.gschema.xml org.gnome.mutter.wayland.gschema.xml
- INTLTOOL_XML_NOMERGE_RULE@
- GSETTINGS_RULES@
-
-convertdir = $(datadir)/GConf/gsettings
-convert_DATA = mutter-schemas.convert
-
 CLEANFILES =                                   \
-       $(desktopfiles_DATA)                    \
-       $(gsettings_SCHEMAS)                    \
-       $(xml_DATA)                             \
        $(mutter_built_sources)                 \
        $(typelib_DATA)                         \
        $(gir_DATA)
 
 pkgconfigdir = $(libdir)/pkgconfig
-
 pkgconfig_DATA = libmutter.pc
 
 EXTRA_DIST =                           \
-       $(wmproperties_files)           \
-       $(IMAGES)                       \
-       $(desktopfiles_in_files)        \
-       $(wmproperties_in_files)        \
-       $(xml_in_files)                 \
        $(wayland_protocols)            \
-       org.gnome.mutter.gschema.xml.in \
-       org.gnome.mutter.wayland.gschema.xml.in \
-       mutter-schemas.convert \
        libmutter.pc.in \
        mutter-enum-types.h.in \
        mutter-enum-types.c.in \