appdata: Add autotool bits for appdata

9 files changed, 39 insertions, 11 deletions

diff --git a/baobab/data/Makefile.am b/baobab/data/Makefile.am
index ec28af3a..f9919811 100644
--- a/baobab/data/Makefile.am
+++ b/baobab/data/Makefile.am
@@ -15,7 +15,10 @@ gsettingsschema_in_files = org.mate.disk-usage-analyzer.gschema.xml.in
 gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
 .PRECIOUS: $(gsettings_SCHEMAS)
 
-@INTLTOOL_XML_NOMERGE_RULE@
+@INTLTOOL_XML_RULE@
+appdatadir = $(datadir)/appdata
+appdata_in_files = mate-disk-usage-analyzer.appdata.xml.in
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
 @GSETTINGS_RULES@
 
@@ -29,9 +32,11 @@ EXTRA_DIST = \
 	mate-disk-usage-analyzer.desktop.in.in \
 	$(gsettingsschema_in_files) \
 	$(convert_DATA) \
+	$(appdata_in_files) \
 	$(man_MANS)
 
 CLEANFILES = \
 	$(baobabapp_in_files) \
 	$(baobabapp_DATA) \
-	$(gsettings_SCHEMAS)
+	$(gsettings_SCHEMAS) \
+	mate-disk-usage-analyzer.appdata.xml
diff --git a/baobab/data/mate-disk-usage-analyzer.appdata.xml b/baobab/data/mate-disk-usage-analyzer.appdata.xml.in
index 3b79ce77..3b79ce77 100644
--- a/baobab/data/mate-disk-usage-analyzer.appdata.xml
+++ b/baobab/data/mate-disk-usage-analyzer.appdata.xml.in
diff --git a/gsearchtool/data/Makefile.am b/gsearchtool/data/Makefile.am
index 54908b3a..d5a3e9d3 100644
--- a/gsearchtool/data/Makefile.am
+++ b/gsearchtool/data/Makefile.am
@@ -1,5 +1,13 @@
 icondir = $(datadir)/pixmaps/mate-search-tool
 icon_DATA = thumbnail_frame.png
 
-EXTRA_DIST = $(icon_DATA)
+@INTLTOOL_XML_RULE@
+appdatadir = $(datadir)/appdata
+appdata_in_files = mate-search-tool.appdata.xml.in
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
+CLEANFILES = mate-search-tool.appdata.xml
+
+EXTRA_DIST = \
+	$(icon_DATA) \
+	$(appdata_in_files)
diff --git a/gsearchtool/mate-search-tool.appdata.xml b/gsearchtool/data/mate-search-tool.appdata.xml.in
index 2b4eaeba..2b4eaeba 100644
--- a/gsearchtool/mate-search-tool.appdata.xml
+++ b/gsearchtool/data/mate-search-tool.appdata.xml.in
diff --git a/mate-dictionary/data/Makefile.am b/mate-dictionary/data/Makefile.am
index 51c78991..f3ec7bad 100644
--- a/mate-dictionary/data/Makefile.am
+++ b/mate-dictionary/data/Makefile.am
@@ -57,9 +57,13 @@ ui_DATA += dictionary-applet-menu.xml
 
 endif # BUILD_GDICT_APPLET
 
+@INTLTOOL_XML_RULE@
+appdatadir = $(datadir)/appdata
+appdata_in_files = mate-dictionary.appdata.xml.in
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+
 gsettingsschema_in_files = org.mate.dictionary.gschema.xml.in
 gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
-@INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
 convertdir = $(datadir)/MateConf/gsettings
@@ -72,6 +76,7 @@ EXTRA_DIST = \
 	$(dictsource_in_files) \
 	$(man_MANS) \
 	$(gsettingsschema_in_files) \
+	$(appdata_in_files) \
 	$(builder_DATA) \
 	$(ui_DATA) \
 	$(convert_DATA) \
@@ -85,4 +90,5 @@ CLEANFILES = \
 	$(gdictapp_in_files) \
 	$(gdictapp_DATA) \
 	$(gsettings_SCHEMAS) \
+	mate-dictionary.appdata.xml \
 	$(NULL)
diff --git a/mate-dictionary/data/mate-dictionary.appdata.xml b/mate-dictionary/data/mate-dictionary.appdata.xml.in
index 969fb30e..969fb30e 100644
--- a/mate-dictionary/data/mate-dictionary.appdata.xml
+++ b/mate-dictionary/data/mate-dictionary.appdata.xml.in
diff --git a/mate-screenshot/Makefile.am b/mate-screenshot/Makefile.am
index e8e54cad..1fa3cdc7 100644
--- a/mate-screenshot/Makefile.am
+++ b/mate-screenshot/Makefile.am
@@ -58,12 +58,15 @@ ui_DATA =					\
 	mate-screenshot.ui			\
 	$(NULL)
 
+@INTLTOOL_XML_RULE@
+appdatadir = $(datadir)/appdata
+appdata_in_files = mate-screenshot.appdata.xml.in
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+
 gsettingsschema_in_files = org.mate.screenshot.gschema.xml.in
 gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
 .PRECIOUS: $(gsettings_SCHEMAS)
 
-@INTLTOOL_XML_NOMERGE_RULE@
-
 @GSETTINGS_RULES@
 
 convertdir = $(datadir)/MateConf/gsettings
@@ -71,17 +74,19 @@ convert_DATA = mate-screenshot.convert
 
 EXTRA_DIST =					\
 	$(gsettingsschema_in_files)		\
+	$(appdata_in_files)			\
 	$(mate_screenshot_in_files)		\
 	$(man_MANS)				\
 	$(ui_DATA)				\
-	$(convert_DATA)			\
+	$(convert_DATA)				\
 	$(NULL)
 
 CLEANFILES = \
-	$(BUILT_SOURCES)			 \
-	$(gsettings_SCHEMAS)			 \
-	$(mate_screenshot_DATA)		 \
-	$(sys_DATA)
+	$(BUILT_SOURCES)			\
+	$(gsettings_SCHEMAS)			\
+	$(mate_screenshot_DATA)			\
+	$(sys_DATA)				\
+	mate-screenshot.appdata.xml
 
 dist-hook:
 	cd $(distdir) ; rm -f $(CLEANFILES)
diff --git a/mate-screenshot/mate-screenshot.appdata.xml b/mate-screenshot/mate-screenshot.appdata.xml.in
index 62df49e1..62df49e1 100644
--- a/mate-screenshot/mate-screenshot.appdata.xml
+++ b/mate-screenshot/mate-screenshot.appdata.xml.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 94defaa7..aed75496 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,6 +4,7 @@ baobab/data/mate-disk-usage-analyzer.desktop.in.in
 [type: gettext/glade]baobab/data/baobab-dialog-scan-props.ui
 [type: gettext/glade]baobab/data/baobab-main-window.ui
 baobab/data/org.mate.disk-usage-analyzer.gschema.xml.in
+baobab/data/mate-disk-usage-analyzer.appdata.xml.in
 baobab/src/baobab.c
 baobab/src/baobab-chart.c
 baobab/src/baobab-prefs.c
@@ -15,6 +16,7 @@ baobab/src/baobab-ringschart.c
 baobab/src/callbacks.c
 mate-dictionary/data/default.desktop.in
 mate-dictionary/data/mate-dictionary.desktop.in.in
+mate-dictionary/data/mate-dictionary.appdata.xml.in
 mate-dictionary/data/org.mate.dictionary.gschema.xml.in
 mate-dictionary/data/org.mate.panel.applet.DictionaryAppletFactory.service.in
 mate-dictionary/data/spanish.desktop.in
@@ -43,6 +45,7 @@ mate-dictionary/src/main.c
 [type: gettext/glade]mate-dictionary/data/mate-dictionary-preferences.ui
 [type: gettext/glade]mate-dictionary/data/mate-dictionary-source.ui
 mate-screenshot/mate-screenshot.c
+mate-screenshot/mate-screenshot.appdata.xml.in
 mate-screenshot/mate-screenshot.desktop.in
 [type: gettext/glade]mate-screenshot/mate-screenshot.ui
 mate-screenshot/org.mate.screenshot.gschema.xml.in
@@ -51,6 +54,7 @@ mate-screenshot/screenshot-save.c
 mate-screenshot/screenshot-shadow.c
 mate-screenshot/screenshot-utils.c
 mate-screenshot/screenshot-xfer.c
+gsearchtool/data/mate-search-tool.appdata.xml.in
 gsearchtool/mate-search-tool.desktop.in
 gsearchtool/gsearchtool.c
 gsearchtool/gsearchtool-callbacks.c