[totem] build: Port from appdata-tools to appstream-glib

[Philip Withnall <pwithnall src gnome org>]

commit cfd1b748e47cf66b7d7921fe9eeae743b9ab8f84
Author: Philip Withnall <philip withnall collabora co uk>
Date:   Thu Oct 30 17:54:46 2014 +0000

    build: Port from appdata-tools to appstream-glib
    
    https://bugzilla.gnome.org/show_bug.cgi?id=739406

 Makefile.am              |    2 +-
 configure.ac             |    2 +-
 data/appdata/Makefile.am |   10 +++++-----
 git.mk                   |    6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 4cad8f6..5cc5e53 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,7 +35,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --enable-gtk-doc \
        --with-nautilusdir='$${libdir}/nautilus/extensions-2.0-distcheck' \
        --enable-introspection \
-       --enable-appdata-validate
+       --enable-appstream-util
 
 # Build ChangeLog from GIT history
 ChangeLog:
diff --git a/configure.ac b/configure.ac
index 0889741..50a3bd7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -495,7 +495,7 @@ GNOME_CXX_WARNINGS
 GNOME_MAINTAINER_MODE_DEFINES
 GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
 
-APPDATA_XML
+APPSTREAM_XML
 
 # This macro expands DIR and assigns it to RET.
 # If DIR is NONE, then it's replaced by DEFAULT.
diff --git a/data/appdata/Makefile.am b/data/appdata/Makefile.am
index 50d848f..89ade54 100644
--- a/data/appdata/Makefile.am
+++ b/data/appdata/Makefile.am
@@ -1,9 +1,9 @@
 # AppData
- APPDATA_XML_RULES@
+ APPSTREAM_XML_RULES@
 @INTLTOOL_XML_RULE@
 
-appdata_in_files = org.gnome.Totem.appdata.xml.in
-appdata_XML = $(appdata_in_files:.xml.in=.xml)
+appstream_in_files = org.gnome.Totem.appdata.xml.in
+appstream_XML = $(appstream_in_files:.xml.in=.xml)
 
-EXTRA_DIST = $(appdata_in_files)
-CLEANFILES = $(appdata_XML)
+EXTRA_DIST = $(appstream_in_files)
+CLEANFILES = $(appstream_XML)
diff --git a/git.mk b/git.mk
index e0e27a7..8a5887c 100644
--- a/git.mk
+++ b/git.mk
@@ -45,7 +45,7 @@
 # build dir.
 #
 # This file knows how to handle autoconf, automake, libtool, gtk-doc,
-# gnome-doc-utils, yelp.m4, mallard, intltool, gsettings, dejagnu, appdata.
+# gnome-doc-utils, yelp.m4, mallard, intltool, gsettings, dejagnu, appstream.
 #
 # This makefile provides the following targets:
 #
@@ -202,9 +202,9 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
                                $(gsettings__enum_file) \
                        ; do echo "/$$x"; done; \
                fi; \
-               if test "x$(appdata_XML)" = x; then :; else \
+               if test "x$(appstream_XML)" = x; then :; else \
                        for x in \
-                               $(appdata_XML:.xml=.valid) \
+                               $(appstream_XML:.xml=.valid) \
                        ; do echo "/$$x"; done; \
                fi; \
                if test -f $(srcdir)/po/Makefile.in.in; then \