From c835113b32d44ba801db5e7b74250df7f9c9fd34 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Sat, 19 May 2018 17:42:25 +0300
Subject: Get rid of doc{version} and types for testscript and manifest in
 buildfiles

---
 .gitignore            |  4 ----
 buildfile             | 10 +---------
 libpkgconf/buildfile  |  2 +-
 tests/api/buildfile   |  2 +-
 tests/basic/buildfile |  2 +-
 5 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3dd23c1..19c7b69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,3 @@
 *.exe.dlls/
 *.exe.manifest
 *.pc
-
-# Generated version.
-#
-version
diff --git a/buildfile b/buildfile
index f4e7523..b634adf 100644
--- a/buildfile
+++ b/buildfile
@@ -2,15 +2,7 @@
 # copyright : Copyright (c) 2016-2017 Code Synthesis Ltd
 # license   : ISC; see accompanying COPYING file
 
-./: {*/ -build/} doc{AUTHORS COPYING INSTALL README version} file{manifest}
-
-# The version file is auto-generated (by the version module) from manifest.
-# Include it in distribution and don't remove when cleaning in src (so that
-# clean results in a state identical to distributed).
-#
-doc{version}: file{manifest}
-doc{version}: dist  = true
-doc{version}: clean = ($src_root != $out_root)
+./: {*/ -build/} doc{AUTHORS COPYING INSTALL README} manifest
 
 # Don't install tests or the INSTALL file.
 #
diff --git a/libpkgconf/buildfile b/libpkgconf/buildfile
index c95d201..91a11ea 100644
--- a/libpkgconf/buildfile
+++ b/libpkgconf/buildfile
@@ -14,7 +14,7 @@ else
 # The version file is an internal one (it is only included from config.h) so we
 # don't distribute nor install it (see below).
 #
-h{version}: in{version} $src_root/file{manifest}
+h{version}: in{version} $src_root/manifest
 
 tclass = $c.target.class
 
diff --git a/tests/api/buildfile b/tests/api/buildfile
index 001001a..8ebe3e5 100644
--- a/tests/api/buildfile
+++ b/tests/api/buildfile
@@ -4,4 +4,4 @@
 
 import libs = libpkgconf%lib{pkgconf}
 
-exe{driver}: {h c}{*} $libs test{testscript}
+exe{driver}: {h c}{*} $libs testscript
diff --git a/tests/basic/buildfile b/tests/basic/buildfile
index 8abc795..ebb8fe2 100644
--- a/tests/basic/buildfile
+++ b/tests/basic/buildfile
@@ -4,4 +4,4 @@
 
 import libs = libpkgconf%lib{pkgconf}
 
-exe{driver}: {h c}{*} $libs test{testscript}
+exe{driver}: {h c}{*} $libs testscript
-- 
cgit v1.1