[gnome-keyring] build: Fix issues on desktop file generation
- From: Daiki Ueno <dueno src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-keyring] build: Fix issues on desktop file generation
- Date: Wed, 13 Dec 2017 14:12:49 +0000 (UTC)
commit d4c51867ff274473b50783e639bdd3fb5a983245
Author: Daiki Ueno <dueno src gnome org>
Date: Wed Dec 13 15:07:22 2017 +0100
build: Fix issues on desktop file generation
This fixes a couple issues in commit 8818e939:
- intermidiate files are left after "make distcheck"
- to incorporate translations, it didn't properly use a suffix rule
Makefile.am | 4 ++--
daemon/Makefile.am | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index edd30af..640c0e9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -133,12 +133,12 @@ SED_SUBST = sed \
-e 's,[@]VERSION[@],$(VERSION),g' \
$(NULL)
-SUFFIXES = .desktop.in .desktop.in.in .service .service.in
+SUFFIXES = .desktop .desktop.in .desktop.in.in .service .service.in
.service.in.service:
$(V_SED) ( $(SED_SUBST) $< > $@.tmp ) && mv $@.tmp $@
-.desktop.in.in.desktop.in:
+.desktop.in.desktop:
$(V_SED) ( $(SED_SUBST) $< > $@.tmp ) && mv $@.tmp $@
all-local:
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index aac2313..3611d42 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -44,11 +44,12 @@ desktop_in_in_files = \
$(NULL)
desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-$(desktop_DATA): $(desktop_in_files)
+.desktop.in.in.desktop.in:
$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
EXTRA_DIST += \
$(service_in_files) \
+ $(desktop_in_files) \
$(desktop_in_in_files)
CLEANFILES += \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]