[frogr] Move generation of .desktop file to data/Makefile.am and use that Makefile

[Mario Sanchez Prada <msanchez src gnome org>]

commit 13533a2b78cff58798e63c2f64e43ca98147d3d7
Author: Mario Sanchez Prada <msanchez gnome org>
Date:   Mon Jun 16 02:16:46 2014 +0100

    Move generation of .desktop file to data/Makefile.am and use that Makefile
    
    Because of a mistake, this Makefile was not being generated by
    Autoconf, nor being used at all before, causing that the AppData
    file was not being installed at all.

 Makefile.am      |   21 ++-------------------
 configure.ac     |    1 +
 data/Makefile.am |   22 ++++++++++++++++++----
 3 files changed, 21 insertions(+), 23 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 96d5f63..79614ca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,7 @@ MAINTAINERCLEANFILES = \
        config.h.in~ \
        config.sub \
        configure \
-       data/frogr.appdata.xml.in \
+       data/frogr.appdata.xml \
        data/frogr.desktop \
        data/frogr.desktop.in \
        debian/files \
@@ -38,7 +38,7 @@ MAINTAINERCLEANFILES = \
        missing \
        mkinstalldirs
 
-SUBDIRS = src po
+SUBDIRS = src data po
 
 if !PLATFORM_MAC
 SUBDIRS += help
@@ -75,30 +75,13 @@ gtkbuilder_DATA = \
        data/gtkbuilder/frogr-context-menu.xml \
        data/gtkbuilder/frogr-menu-bar.xml
 
-desktopentrydir = $(datadir)/applications
-desktopentry_DATA = $(builddir)/data/frogr.desktop
- INTLTOOL_DESKTOP_RULE@
-
 man1_MANS = data/manpages/frogr.1
 
-edit = sed -e 's,@BINDIR\@,$(bindir),g' -e 's,@PIXMAPDIR\@,$(pixmapdir),g'
-
-data/frogr.desktop.in: data/frogr.desktop.in.in
-       mkdir -p $(builddir)/data
-       $(edit) $(srcdir)/data/frogr.desktop.in.in > $(builddir)/data/frogr.desktop.in
-
-DISTCLEANFILES = \
-       $(builddir)/data/frogr.appdata.xml.in \
-       $(builddir)/data/frogr.desktop \
-       $(builddir)/data/frogr.desktop.in
-
 EXTRA_DIST = \
        MAINTAINERS \
        TRANSLATORS \
        autogen.sh \
        src/flicksoup/COPYING \
-       data/frogr.appdata.xml.in \
-       data/frogr.desktop.in.in \
        m4 \
        $(pixmap_DATA) \
        $(icon16_DATA) \
diff --git a/configure.ac b/configure.ac
index 3499c1c..f791741 100644
--- a/configure.ac
+++ b/configure.ac
@@ -129,6 +129,7 @@ AC_SUBST(FROGR_LIBS)
 
 AC_CONFIG_FILES([
         Makefile
+        data/Makefile
         src/Makefile
         src/flicksoup/Makefile
         src/examples/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 7de1e47..b961eec 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,9 +1,23 @@
+ INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_XML_RULE@
+
+desktopdir = $(datadir)/applications
+desktop_in_files = frogr.desktop.in.in
+desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
+
+edit = sed -e 's,@BINDIR\@,$(bindir),g' -e 's,@PIXMAPDIR\@,$(datadir)\/pixmaps,g'
+frogr.desktop.in: frogr.desktop.in.in
+       $(edit) $(srcdir)/frogr.desktop.in.in > $(builddir)/frogr.desktop.in
+
 appdatadir = $(datadir)/appdata
 appdata_in_files = frogr.appdata.xml.in
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
- INTLTOOL_XML_RULE@
 
-CLEANFILES =   $(appdata_DATA) \
-               $(desktop_DATA)
+CLEANFILES = \
+       $(appdata_DATA) \
+       $(desktop_DATA) \
+       $(desktop_DATA).in
 
-EXTRA_DIST = $(appdata_in_files)
+EXTRA_DIST = \
+       $(appdata_in_files) \
+       $(desktop_in_files)