Use INTLTOOL_XML_RULE for appdata files

The translation should be merged into the appdata related files.
The evolution.appdata.xml.in had been moved due to
INTLTOOL_XML_NOMERGE_RULE being used for gsettings schemas.

Makefile.am

@@ -12,8 +12,15 @@ pkgconfig_in_files =					\
 	evolution-shell-$(INTERFACE_VERSION).pc
 pkgconfig_DATA = $(pkgconfig_in_files:.pc.in=-$(INTERFACE_VERSION).pc)
 
+@INTLTOOL_XML_RULE@
+appdatadir = $(datadir)/appdata
+appdata_in_files = evolution.appdata.xml.in
+appdata_files = $(appdata_in_files:.xml.in=.xml)
+dist_appdata_DATA = $(appdata_files)
+
 EXTRA_DIST = 			\
 	$(pkgconfig_DATA)	\
+	$(appdata_in_files)	\
 	AUTHORS			\
 	COPYING-DOCS		\
 	COPYING.LGPL2		\
@@ -76,7 +83,8 @@ SUBDIRS = 			\
 
 DISTCLEANFILES = 			\
 	$(builddir)/iconv-detect.h	\
-	$(pkgconfig_in_files)
+	$(pkgconfig_in_files)		\
+	$(appdata_files)
 
 MAINTAINERCLEANFILES =			\
 	$(srcdir)/ABOUT-NLS		\

data/Makefile.am

@@ -31,11 +31,6 @@ gsettings_SCHEMAS =							\
 	org.gnome.evolution.plugin.templates.gschema.xml
 
 @INTLTOOL_XML_NOMERGE_RULE@
-appdatadir = $(datadir)/appdata
-appdata_in_files = evolution.appdata.xml.in
-appdata_files = $(appdata_in_files:.xml.in=.xml)
-dist_appdata_DATA = $(appdata_files)
-
 @GSETTINGS_RULES@
 
 convertdir = $(datadir)/GConf/gsettings
@@ -69,14 +64,12 @@ CLEANFILES =					\
 	$(desktop_DATA)
 
 EXTRA_DIST =					\
-	$(appdata_in_files)			\
 	$(autostart_in_files)			\
 	$(desktop_in_files)			\
 	$(convert_DATA)				\
 	$(gsettings_SCHEMAS:.xml=.xml.in)
 
 DISTCLEANFILES =		\
-	$(appdata_files)	\
 	$(gsettings_SCHEMAS)
 
 -include $(top_srcdir)/git.mk

modules/bogofilter/Makefile.am

@@ -22,7 +22,7 @@ module_bogofilter_la_LIBADD = \
 module_bogofilter_la_LDFLAGS = \
 	-module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
-@INTLTOOL_XML_NOMERGE_RULE@
+@INTLTOOL_XML_RULE@
 metainfodir = $(datadir)/appdata
 metainfo_in_files = evolution-bogofilter.metainfo.xml.in
 metainfo_files = $(metainfo_in_files:.xml.in=.xml)

modules/spamassassin/Makefile.am

@@ -24,7 +24,7 @@ module_spamassassin_la_LIBADD = \
 module_spamassassin_la_LDFLAGS = \
 	-module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
 
-@INTLTOOL_XML_NOMERGE_RULE@
+@INTLTOOL_XML_RULE@
 metainfodir = $(datadir)/appdata
 metainfo_in_files = evolution-spamassassin.metainfo.xml.in
 metainfo_files = $(metainfo_in_files:.xml.in=.xml)