[devhelp] build: Use APPSTREAM_XML



commit cf0313800fa269fd8ecf1617dcb62040b6145e04
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Thu Nov 10 16:59:04 2016 -0600

    build: Use APPSTREAM_XML
    
    Surprising that devhelp is manually handling appdata files still.
    
    This would be a good time to start validating that the file is actually
    good.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=774069

 Makefile.am      |    5 ++++-
 configure.ac     |    3 +++
 data/Makefile.am |   12 +++++-------
 3 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index d535b60..0e8351b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,7 @@
-AM_DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --disable-Werror
+AM_DISTCHECK_CONFIGURE_FLAGS = \
+       --enable-introspection  \
+       --enable-appstream-util \
+       --disable-Werror
 
 SUBDIRS = po src data misc contrib docs
 
diff --git a/configure.ac b/configure.ac
index 8c40d78..45ad8a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,6 +39,9 @@ AC_PROG_CC
 LT_PREREQ([2.2])
 LT_INIT([disable-static])
 
+AX_REQUIRE_DEFINED([APPSTREAM_XML])
+APPSTREAM_XML
+
 AX_REQUIRE_DEFINED([GLIB_GSETTINGS])
 GLIB_GSETTINGS
 
diff --git a/data/Makefile.am b/data/Makefile.am
index 00ecac3..522ad63 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -14,11 +14,9 @@ gsettings_SCHEMAS = org.gnome.devhelp.gschema.xml
 gsettingsconvertdir = $(datadir)/GConf/gsettings
 gsettingsconvert_DATA = devhelp.convert
 
-app_data_in_files = org.gnome.Devhelp.appdata.xml.in
-app_data_files = $(app_data_in_files:.xml.in=.xml)
-
-appdatadir = $(datadir)/appdata
-appdata_DATA = $(app_data_files)
+appstream_in_files = org.gnome.Devhelp.appdata.xml.in
+appstream_XML = $(appstream_in_files:.xml.in=.xml)
+@APPSTREAM_XML_RULES@
 
 @INTLTOOL_XML_RULE@
 
@@ -47,11 +45,11 @@ EXTRA_DIST =                        \
        devhelp.convert \
        $(assistant_DATA) \
        $(man_MANS) \
-       $(app_data_in_files)
+       $(appstream_in_files)
 
 CLEANFILES =                   \
        $(DESKTOP_FILES)        \
        $(defaults_DATA)        \
        $(desktop_DATA)         \
        $(dbusservice_DATA)     \
-       $(app_data_files)
+       $(appstream_XML)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]