summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-11-12 15:53:58 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-11-12 15:53:58 +0100
commit2492891f112caac6076ce49721d9d5d78a152c3a (patch)
tree36dd11a60bd963e6bd44e2e312b6e4b57d1849ea /misc
parent3c829c50a8f705402bdc759946d49ae7caebd003 (diff)
New upstream version 0.26.4upstream/0.26.4
Diffstat (limited to 'misc')
-rw-r--r--misc/Makefile.am10
-rw-r--r--misc/Makefile.in10
2 files changed, 10 insertions, 10 deletions
diff --git a/misc/Makefile.am b/misc/Makefile.am
index 711b06f..aa9a2bd 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -2,14 +2,14 @@ gsettings_SCHEMAS = \
org.yorba.shotwell.gschema.xml \
org.yorba.shotwell-extras.gschema.xml
-appdata_in_files = $(srcdir)/shotwell.appdata.xml.in
-appdata_XML = \
+appstream_in_files = $(srcdir)/shotwell.appdata.xml.in
+appstream_XML = \
shotwell.appdata.xml
desktopdir = $(datadir)/applications
desktop_DATA = shotwell.desktop shotwell-viewer.desktop
-$(appdata_XML) : $(appdata_in_files)
+$(appstream_XML) : $(appstream_in_files)
$(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
%.desktop.in : %.desktop.in.in
@@ -21,12 +21,12 @@ $(appdata_XML) : $(appdata_in_files)
@GSETTINGS_RULES@
@APPSTREAM_XML_RULES@
-CLEANFILES = $(appdata_XML) $(desktop_DATA) $(desktop_in_files)
+CLEANFILES = $(appstream_XML) $(desktop_DATA) $(desktop_in_files)
dist_noinst_DATA = \
$(srcdir)/shotwell.desktop.in.in \
$(srcdir)/shotwell-viewer.desktop.in.in \
$(gsettings_SCHEMAS) \
- $(appdata_in_files)
+ $(appstream_in_files)
-include $(top_srcdir)/git.mk
diff --git a/misc/Makefile.in b/misc/Makefile.in
index 36072f4..0571904 100644
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -345,18 +345,18 @@ gsettings_SCHEMAS = \
org.yorba.shotwell.gschema.xml \
org.yorba.shotwell-extras.gschema.xml
-appdata_in_files = $(srcdir)/shotwell.appdata.xml.in
-appdata_XML = \
+appstream_in_files = $(srcdir)/shotwell.appdata.xml.in
+appstream_XML = \
shotwell.appdata.xml
desktopdir = $(datadir)/applications
desktop_DATA = shotwell.desktop shotwell-viewer.desktop
-CLEANFILES = $(appdata_XML) $(desktop_DATA) $(desktop_in_files)
+CLEANFILES = $(appstream_XML) $(desktop_DATA) $(desktop_in_files)
dist_noinst_DATA = \
$(srcdir)/shotwell.desktop.in.in \
$(srcdir)/shotwell-viewer.desktop.in.in \
$(gsettings_SCHEMAS) \
- $(appdata_in_files)
+ $(appstream_in_files)
all: all-am
@@ -576,7 +576,7 @@ uninstall-am: uninstall-desktopDATA
.PRECIOUS: Makefile
-$(appdata_XML) : $(appdata_in_files)
+$(appstream_XML) : $(appstream_in_files)
$(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
%.desktop.in : %.desktop.in.in