diff options
| author | Alessio Treglia <alessio@debian.org> | 2013-10-05 15:29:30 +0100 |
|---|---|---|
| committer | Alessio Treglia <alessio@debian.org> | 2013-10-05 15:29:30 +0100 |
| commit | e51f2bbb5a0f25b37330891d769b996a2c13d277 (patch) | |
| tree | 25d429c588012a476c15b6ca5b4bf393613beca3 /data/Makefile.am | |
| parent | 438230655b539ad6aa15b017a792cab8ca7f6d89 (diff) | |
| parent | 2d71d20a62ca8f6989d86db58ce64c7a862675dd (diff) | |
Merge tag 'upstream/3.10.0'
Upstream version 3.10.0
Diffstat (limited to 'data/Makefile.am')
| -rw-r--r-- | data/Makefile.am | 20 |
1 files changed, 11 insertions, 9 deletions
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) |