[gnome-2048] Port from appdata-tools to appstream-util
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-2048] Port from appdata-tools to appstream-util
- Date: Mon, 23 Feb 2015 00:00:10 +0000 (UTC)
commit e57def456639177d6b688243c9157abe8457873f
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Sun Feb 22 17:59:42 2015 -0600
Port from appdata-tools to appstream-util
configure.ac | 3 ++-
data/Makefile.am | 14 ++++++++------
2 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index bcba51d..9742e9e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,6 +11,8 @@ AM_PROG_CC_C_O
GLIB_GSETTINGS
+APPSTREAM_XML
+
dnl ###########################################################################
dnl Dependencies
dnl ###########################################################################
@@ -29,7 +31,6 @@ PKG_CHECK_MODULES(GNOME_2048, [
libgames-support >= $LIBGAMES_REQUIRED
])
-AC_PATH_PROG([APPDATA_VALIDATE], [appdata-validate], [/bin/true])
AC_PATH_PROG([DESKTOP_FILE_VALIDATE], [desktop-file-validate], [/bin/true])
GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0`
diff --git a/data/Makefile.am b/data/Makefile.am
index e79cac8..f1e1d04 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -8,21 +8,23 @@ desktop_in_files = org.gnome.gnome-2048.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
-appdatadir = $(datadir)/appdata
-appdata_in_files = org.gnome.gnome-2048.appdata.xml.in
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+appstream_in_files = org.gnome.gnome-2048.appdata.xml.in
+appstream_XML = $(appdata_in_files:.xml.in=.xml)
+ APPSTREAM_XML_RULES@
@INTLTOOL_XML_RULE@
EXTRA_DIST = \
- $(appdata_in_files) \
+ $(appstream_in_files) \
$(gsettings_SCHEMAS) \
$(desktop_in_files)
CLEANFILES = \
+ $(appstream_XML) \
$(desktop_DATA)
-check-local: $(appdata_DATA) $(desktop_DATA)
- $(APPDATA_VALIDATE) $(appdata_DATA)
+check-local: $(desktop_DATA)
$(DESKTOP_FILE_VALIDATE) $(desktop_DATA)
+DISTCHECK_CONFIGURE_FLAGS == --enable-appdata-check
+
-include $(top_srcdir)/git.mk
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]