From bfca57fb52ab7101f701560a2e6feb3a388ef5bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Wed, 24 Aug 2016 04:12:59 +0200
Subject: Imported Upstream version 3.21.90

---
 data/Makefile.am | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

(limited to 'data/Makefile.am')

diff --git a/data/Makefile.am b/data/Makefile.am
index e367c9e..5f421a0 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,21 +1,30 @@
-SUBDIRS = icons appdata
+SUBDIRS = icons
 
 desktopdir = $(datadir)/applications
-desktop_DATA = simple-scan.desktop
-@INTLTOOL_DESKTOP_RULE@
-@INTLTOOL_XML_NOMERGE_RULE@
+desktop_in_files = simple-scan.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+
+$(desktop_DATA): $(desktop_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 gsettings_SCHEMAS = org.gnome.SimpleScan.gschema.xml
 @GSETTINGS_RULES@
 
+appstream_in_files = simple-scan.appdata.xml.in
+appstream_XML = $(appstream_in_files:.appdata.xml.in=.appdata.xml)
+@APPSTREAM_XML_RULES@
+
+$(appstream_XML): $(appstream_in_files)
+	$(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
+
 dist_man1_MANS = simple-scan.1
 
-EXTRA_DIST = simple-scan.desktop.in \
-             org.gnome.SimpleScan.gschema.xml.in \
+EXTRA_DIST = $(desktop_in_files)  \
+             $(appstream_in_files) \
+             $(gsettings_SCHEMAS) \
              simple-scan.ui \
              simple-scan.gresource.xml
 
 DISTCLEANFILES = \
-	$(schema_DATA) \
 	$(desktop_DATA) \
-	$(gsettings_SCHEMAS)
+	$(appstream_XML)
-- 
cgit v1.2.3