[gnome-flashback] move *.desktop files to data dir

[Alberts Muktupāvels <muktupavels src gnome org>]

commit bdd84f5b8297a13629078ccdf481e74d793957aa
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Thu Oct 16 18:47:27 2014 +0300

    move *.desktop files to data dir

 data/Makefile.am                                   |    6 ++++++
 .../gnome-flashback-init.desktop.in                |    0
 .../gnome-flashback.desktop.in                     |    0
 gnome-flashback-init/Makefile.am                   |   14 --------------
 gnome-flashback/Makefile.am                        |    8 --------
 po/POTFILES.in                                     |    4 ++--
 6 files changed, 8 insertions(+), 24 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index d766a48..ab321a3 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -16,6 +16,10 @@ session_DATA     = $(session_in_files:.session.in=.session)
 
 %.session: %.session.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d 
-u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
 
+desktopdir       = $(datadir)/applications
+desktop_in_files = gnome-flashback.desktop.in gnome-flashback-init.desktop.in
+desktop_DATA     = $(desktop_in_files:.desktop.in=.desktop)
+
 xsessiondir          = $(datadir)/xsessions
 xsession_in_in_files = gnome-flashback-compiz.desktop.in.in gnome-flashback-metacity.desktop.in.in
 xsession_in_files    = gnome-flashback-compiz.desktop.in gnome-flashback-metacity.desktop.in
@@ -27,10 +31,12 @@ xsession_DATA        = $(xsession_in_files:.desktop.in=.desktop)
 %.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d 
-u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
 
 EXTRA_DIST = \
+       $(desktop_in_files) \
        $(session_in_files) \
        $(xsession_in_in_files)
 
 CLEANFILES = \
+       $(desktop_DATA) \
        gnome-flashback-compiz \
        gnome-flashback-metacity \
        $(session_DATA) \
diff --git a/gnome-flashback-init/gnome-flashback-init.desktop.in b/data/gnome-flashback-init.desktop.in
similarity index 100%
rename from gnome-flashback-init/gnome-flashback-init.desktop.in
rename to data/gnome-flashback-init.desktop.in
diff --git a/gnome-flashback/gnome-flashback.desktop.in b/data/gnome-flashback.desktop.in
similarity index 100%
rename from gnome-flashback/gnome-flashback.desktop.in
rename to data/gnome-flashback.desktop.in
diff --git a/gnome-flashback-init/Makefile.am b/gnome-flashback-init/Makefile.am
index f5c30a4..629b137 100644
--- a/gnome-flashback-init/Makefile.am
+++ b/gnome-flashback-init/Makefile.am
@@ -11,18 +11,4 @@ gnome_flashback_init_SOURCES = \
 gnome_flashback_init_LDADD = \
        $(GNOME_FLASHBACK_INIT_LIBS)
 
-desktopdir       = $(datadir)/applications
-desktop_in_files = gnome-flashback-init.desktop.in
-desktop_DATA     = $(desktop_in_files:.desktop.in=.desktop)
-
-%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d 
-u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
-
- INTLTOOL_XML_NOMERGE_RULE@
-
-EXTRA_DIST = \
-       $(desktop_in_files)
-
-CLEANFILES = \
-       $(desktop_DATA)
-
 -include $(top_srcdir)/git.mk
diff --git a/gnome-flashback/Makefile.am b/gnome-flashback/Makefile.am
index 362a449..824cfc6 100644
--- a/gnome-flashback/Makefile.am
+++ b/gnome-flashback/Makefile.am
@@ -26,12 +26,6 @@ gnome_flashback_LDADD = \
        $(top_builddir)/gnome-flashback/libidle-monitor/libidle-monitor.la \
        $(top_builddir)/gnome-flashback/libsound-applet/libsound-applet.la
 
-desktopdir       = $(datadir)/applications
-desktop_in_files = gnome-flashback.desktop.in
-desktop_DATA     = $(desktop_in_files:.desktop.in=.desktop)
-
-%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d 
-u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
-
 @INTLTOOL_XML_NOMERGE_RULE@
 
 gsettings_schemas_in_in = org.gnome.gnome-flashback.gschema.xml.in.in
@@ -44,11 +38,9 @@ gsettings_SCHEMAS       = $(gsettings_schemas_in:.xml.in=.xml)
 @GSETTINGS_RULES@
 
 EXTRA_DIST = \
-       $(desktop_in_files) \
        $(gsettings_schemas_in_in)
 
 CLEANFILES = \
-       $(desktop_DATA) \
        $(gsettings_schemas_in) \
        $(gsettings_SCHEMAS) \
        *.gschema.valid
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 85e255f..39e39b4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,11 +1,12 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 [encoding: UTF-8]
+data/gnome-flashback.desktop.in
 data/gnome-flashback-compiz.desktop.in.in
 data/gnome-flashback-compiz.session.in
+data/gnome-flashback-init.desktop.in
 data/gnome-flashback-metacity.desktop.in.in
 data/gnome-flashback-metacity.session.in
-gnome-flashback/gnome-flashback.desktop.in
 gnome-flashback/libend-session-dialog/flashback-inhibit-dialog.c
 [type: gettext/glade]gnome-flashback/libend-session-dialog/flashback-inhibit-dialog.ui
 gnome-flashback/libsound-applet/gvc-applet.c
@@ -13,4 +14,3 @@ gnome-flashback/libsound-applet/gvc-channel-bar.c
 gnome-flashback/libsound-applet/gvc-stream-status-icon.c
 gnome-flashback/libsound-applet/gvc/gvc-mixer-control.c
 gnome-flashback/org.gnome.gnome-flashback.gschema.xml.in.in
-gnome-flashback-init/gnome-flashback-init.desktop.in