Get rid of doc{version} and types for testscript and manifest in buildfiles

4 files changed, 3 insertions, 12 deletions

diff --git a/hello/buildfile b/hello/buildfile
index 8b7417f..bca55a2 100644
--- a/hello/buildfile
+++ b/hello/buildfile
@@ -1 +1 @@
-./: {*/ -build/} file{manifest}
+./: {*/ -build/} manifest
diff --git a/hello/hello/buildfile b/hello/hello/buildfile
index 4a510b0..c0e316b 100644
--- a/hello/hello/buildfile
+++ b/hello/hello/buildfile
@@ -1,5 +1,5 @@
 import libs = libhello%lib{hello}
 
-exe{hello}: {hxx ixx txx cxx}{*} $libs test{testscript}
+exe{hello}: {hxx ixx txx cxx}{*} $libs testscript
 
 cxx.poptions =+ "-I$out_root" "-I$src_root"
diff --git a/mhello/.gitignore b/mhello/.gitignore
index 2d50bcd..bd29d30 100644
--- a/mhello/.gitignore
+++ b/mhello/.gitignore
@@ -18,4 +18,3 @@
 *.pc
 
 hello
-version
diff --git a/mhello/buildfile b/mhello/buildfile
index 629eebb..ae461b3 100644
--- a/mhello/buildfile
+++ b/mhello/buildfile
@@ -1,15 +1,7 @@
 import libs  = libmhello%lib{mhello}
 import libs += libstd-modules%liba{std-modules}
 
-./: exe{hello} doc{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)
+./: exe{hello} manifest
 
 exe{hello}: cxx{hello} $libs
 exe{hello}: file{test.out}: test.stdout = true