[gnome-chess] Revert "build: use standard appdata rules"
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-chess] Revert "build: use standard appdata rules"
- Date: Mon, 18 Aug 2014 23:56:12 +0000 (UTC)
commit bfa69e73fa94e6a76d09310df604647b57f14250
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Mon Aug 18 18:52:12 2014 -0500
Revert "build: use standard appdata rules"
This reverts commit 8ff0fcf07752c15b5d30b4089de0b163645ba65c.
Makefile.am | 3 ---
configure.ac | 3 +--
data/Makefile.am | 10 ++++++----
3 files changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 94263d3..66c3e32 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,9 +11,6 @@ MAINTAINERCLEANFILES = \
$(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \
$(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL)
-DISTCHECK_CONFIGURE_FLAGS = \
- --enable-appdata-check
-
# We currently have no custom macros
GITIGNOREFILES = m4
diff --git a/configure.ac b/configure.ac
index 905b74e..62bd527 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,8 +18,6 @@ LT_INIT
GLIB_GSETTINGS
-APPDATA_XML
-
dnl ###########################################################################
dnl Dependencies
dnl ###########################################################################
@@ -51,6 +49,7 @@ PKG_CHECK_MODULES(TEST, [
AC_CHECK_HEADERS([linux/prctl.h])
AM_CONDITIONAL([WITH_PRCTL], [test x$ac_cv_header_linux_prctl_h = xyes])
+AC_PATH_PROG([APPDATA_VALIDATE], [appdata-validate], [/bin/true])
AC_PATH_PROG([DESKTOP_FILE_VALIDATE], [desktop-file-validate], [/bin/true])
dnl ###########################################################################
diff --git a/data/Makefile.am b/data/Makefile.am
index 9b5830d..a7fd2e9 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -5,9 +5,10 @@ desktop_in_files = gnome-chess.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
+appdatadir = $(datadir)/appdata
appdata_in_files = gnome-chess.appdata.xml.in
-appdata_XML = $(appdata_in_files:.appdata.xml.in=.appdata.xml)
- APPDATA_XML_RULES@
+appdata_DATA = $(appdata_in_files:.appdata.xml.in=.appdata.xml)
+ INTLTOOL_XML_RULE@
uidir = $(pkgdatadir)
dist_ui_DATA = \
@@ -24,7 +25,8 @@ dist_pkgsysconf_DATA = engines.conf
dist_man_MANS = gnome-chess.6
-check-local: $(desktop_DATA)
+check-local: $(appdata_DATA) $(desktop_DATA)
+ $(APPDATA_VALIDATE) $(appdata_DATA)
$(DESKTOP_FILE_VALIDATE) $(desktop_DATA)
EXTRA_DIST = \
@@ -33,7 +35,7 @@ EXTRA_DIST = \
$(gsettings_SCHEMAS)
CLEANFILES = \
- $(appdata_XML) \
+ $(appdata_DATA) \
$(desktop_DATA)
-include $(top_srcdir)/git.mk
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]