From deefe3f9194aca19f1b4f98dc16a736ae7e79e0a Mon Sep 17 00:00:00 2001 From: Travis Reitter Date: Mon, 8 Jul 2013 16:23:30 -0700 Subject: [PATCH] build: distcheck fails trying to remove a srcdir file When we referenced $(srcdir)/libfolks_telepathy_la_vala.stamp, we were telling automake that it was OK to delete it from the srcdir, which is considered bad form. By referring to it from the builddir, we don't implicitly suggest it can be deleted (as it is as a part of its creation process). Bug: https://bugzilla.gnome.org/show_bug.cgi?id=703830 --- NEWS | 2 ++ backends/telepathy/lib/Makefile.am | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 3e98ccd..8c97d3e 100644 --- a/NEWS +++ b/NEWS @@ -12,6 +12,8 @@ Bugs fixed: • Bug 703450 — Telepathy backend gir fails to link • Bug 703514 — Can't build FolksTelepathy-0.6.gir • Bug 703709 — can't compile folks. fails at GISCAN TpLowlevel-0.6.gir +• Bug 703830 — build: distcheck fails trying to delete + libfolks_telepathy_la_vala.stamp API changes: • Add PresenceDetails.client_types diff --git a/backends/telepathy/lib/Makefile.am b/backends/telepathy/lib/Makefile.am index 472637b..15def22 100644 --- a/backends/telepathy/lib/Makefile.am +++ b/backends/telepathy/lib/Makefile.am @@ -199,7 +199,7 @@ FOLKS_TP_VALA_DEPS += tp-zeitgeist.vapi else FOLKS_TP_VALA_DEPS += tp-zeitgeist-dummy.vapi endif -$(srcdir)/libfolks_telepathy_la_vala.stamp: $(FOLKS_TP_VALA_DEPS) +$(builddir)/libfolks_telepathy_la_vala.stamp: $(FOLKS_TP_VALA_DEPS) libfolks_telepathy_la_SOURCES = \ tpf-namespace.vala \ -- 2.7.4