From 3adf32e7427eb88a627056099c3992b782bab3ad Mon Sep 17 00:00:00 2001
From: Mathieu Lirzin <mthl@gnu.org>
Date: Tue, 10 Jan 2017 08:59:57 +0100
Subject: [PATCH] build: Don't generate ".version" since it has no use.

* Makefile.am (.version): Remove target.
(EXTRA_DIST): Adapt.
(BUILT_SOURCES): Likewise.
* build-aux/guix.scm (git-version-gen): Call 'git-version-gen' with
'.tarball-version'.
* .gitignore: Update.
---
 .gitignore         | 1 -
 Makefile.am        | 7 +------
 build-aux/guix.scm | 2 +-
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2ff64ea..2cf3032 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@
 *.trs
 .dirstamp
 /*.status
-/.version
 /INSTALL
 /aclocal.m4
 /autom4te.cache/
diff --git a/Makefile.am b/Makefile.am
index bf1dd66..c77ad64 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -99,7 +99,6 @@ sql-check: src/schema.sql
 
 EXTRA_DIST = \
   .dir-locals.el \
-  .version \
   bin/cuirass.in \
   bin/evaluate.in \
   bootstrap \
@@ -107,10 +106,6 @@ EXTRA_DIST = \
   src/cuirass/config.scm.in \
   $(TESTS)
 
-BUILT_SOURCES = .version
-.version:
-	$(AM_V_GEN)echo $(VERSION) > $@-t && mv $@-t $@
-
 dist-hook: gen-ChangeLog
 	$(AM_V_GEN)echo $(VERSION) > $(distdir)/.tarball-version
 
@@ -172,7 +167,7 @@ src/cuirass/config.scm: $(srcdir)/src/cuirass/config.scm.in Makefile
 
 # Guile modules require 'src/cuirass/config.scm' to exist before their
 # compilation.
-BUILT_SOURCES += src/cuirass/config.scm
+BUILT_SOURCES = src/cuirass/config.scm
 
 MOSTLYCLEANFILES = $(bin_SCRIPTS) src/cuirass/config.scm
 
diff --git a/build-aux/guix.scm b/build-aux/guix.scm
index dc50361..3d63921 100644
--- a/build-aux/guix.scm
+++ b/build-aux/guix.scm
@@ -40,7 +40,7 @@
 
 (define (git-version-gen)
   ;; Return a string containing Cuirass version number.
-  (let* ((cmd  "git-version-gen .version")
+  (let* ((cmd  "git-version-gen .tarball-version")
          (port (open-input-pipe (string-append %srcdir "/" cmd)))
          (str  (read-line port)))
     (close-pipe port)