[shotwell] build: Remove unnecessary desktop file processing
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [shotwell] build: Remove unnecessary desktop file processing
- Date: Thu, 25 May 2017 07:28:41 +0000 (UTC)
commit 2b5a2e7c5e58baccce32a42a6ec881af1464ebe5
Author: Jens Georg <mail jensge org>
Date: Thu May 25 08:34:07 2017 +0200
build: Remove unnecessary desktop file processing
misc/Makefile.am | 7 ++-----
...er.desktop.in.in => shotwell-viewer.desktop.in} | 0
...{shotwell.desktop.in.in => shotwell.desktop.in} | 0
po/POTFILES.in | 4 ++--
4 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/misc/Makefile.am b/misc/Makefile.am
index 6376879..3ccf48b 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -12,9 +12,6 @@ desktop_DATA = shotwell.desktop shotwell-viewer.desktop
$(appdata_XML) : $(appdata_in_files)
$(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
-%.desktop.in : %.desktop.in.in
- $(AM_V_GEN) sed -e 's|@VERSION[@]|$(VERSION)|g' $< > $@
-
%.desktop : %.desktop.in
$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
@@ -24,8 +21,8 @@ $(appdata_XML) : $(appdata_in_files)
CLEANFILES = $(appdata_XML) $(desktop_DATA) $(desktop_in_files)
dist_noinst_DATA = \
- $(srcdir)/shotwell.desktop.in.in \
- $(srcdir)/shotwell-viewer.desktop.in.in \
+ $(srcdir)/shotwell.desktop.in \
+ $(srcdir)/shotwell-viewer.desktop.in \
$(gsettings_SCHEMAS) \
$(appdata_in_files)
diff --git a/misc/shotwell-viewer.desktop.in.in b/misc/shotwell-viewer.desktop.in
similarity index 100%
rename from misc/shotwell-viewer.desktop.in.in
rename to misc/shotwell-viewer.desktop.in
diff --git a/misc/shotwell.desktop.in.in b/misc/shotwell.desktop.in
similarity index 100%
rename from misc/shotwell.desktop.in.in
rename to misc/shotwell.desktop.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a7ae54a..06c15e9 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,8 +1,8 @@
# List of source files containing translatable strings.
# Please keep this file sorted alphabetically.
misc/shotwell.appdata.xml.in
-misc/shotwell.desktop.in.in
-misc/shotwell-viewer.desktop.in.in
+misc/shotwell.desktop.in
+misc/shotwell-viewer.desktop.in
misc/org.yorba.shotwell-extras.gschema.xml
misc/org.yorba.shotwell.gschema.xml
plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]