From 2d71d20a62ca8f6989d86db58ce64c7a862675dd Mon Sep 17 00:00:00 2001 From: Alessio Treglia Date: Sat, 5 Oct 2013 15:28:26 +0100 Subject: Imported Upstream version 3.10.0 --- data/Makefile.am | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'data/Makefile.am') diff --git a/data/Makefile.am b/data/Makefile.am index c99f807..b436f12 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,23 +1,25 @@ SUBDIRS = icons -uidir = $(datadir)/simple-scan -ui_DATA = simple-scan.ui - -utilitiesdir = $(datadir)/applications -utilities_in_files = simple-scan.desktop.in -utilities_DATA = $(utilities_in_files:.desktop.in=.desktop) +desktopdir = $(datadir)/applications +desktop_DATA = simple-scan.desktop @INTLTOOL_DESKTOP_RULE@ +appdatadir = $(datadir)/appdata +dist_appdata_DATA = simple-scan.appdata.xml + gsettings_SCHEMAS = org.gnome.SimpleScan.gschema.xml @INTLTOOL_XML_NOMERGE_RULE@ @GSETTINGS_RULES@ -man1_MANS = simple-scan.1 +dist_man1_MANS = simple-scan.1 -EXTRA_DIST = $(ui_DATA) $(utilities_in_files) org.gnome.SimpleScan.gschema.xml.in $(man1_MANS) +EXTRA_DIST = simple-scan.desktop.in \ + org.gnome.SimpleScan.gschema.xml.in \ + simple-scan.ui \ + simple-scan.gresource.xml DISTCLEANFILES = \ Makefile.in \ $(schema_DATA) \ - $(utilities_DATA) \ + $(desktop_DATA) \ $(gsettings_SCHEMAS) -- cgit v1.2.3