Add version.hxx back into distribution and don't clean it up from src

4 files changed, 10 insertions, 1 deletions

diff --git a/README-GIT b/README-GIT
new file mode 100644
index 0000000..7f8d37d
--- /dev/null
+++ b/README-GIT
@@ -0,0 +1,4 @@
+The checked out libstudxml/version.hxx will be overwritten during the build
+process but these changes should be ignored. To do this automatically, run:
+
+git update-index --assume-unchanged libstudxml/version.hxx
diff --git a/libstudxml/.gitignore b/libstudxml/.gitignore
deleted file mode 100644
index 426db9e..0000000
--- a/libstudxml/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-version.hxx
diff --git a/libstudxml/buildfile b/libstudxml/buildfile
index b92815d..40c33d3 100644
--- a/libstudxml/buildfile
+++ b/libstudxml/buildfile
@@ -23,7 +23,13 @@ details/expat/doc{LICENSE}@./: install = doc/EXPAT-LICENSE
 #
 lib{studxml}: details/genx/{h{*} c{*} doc{LICENSE README}}
 
+# Include the generated version header into the distribution (so that we don't
+# pick up an installed one) and don't remove it when cleaning in src (so that
+# clean results in a state identical to distributed).
+#
 hxx{version}: in{version} $src_root/file{manifest}
+hxx{version}: dist  = true
+hxx{version}: clean = ($src_root != $out_root)
 
 details/genx/doc{README}@./:  install = false
 details/genx/doc{LICENSE}@./: install = doc/GENX-LICENSE
diff --git a/libstudxml/version.hxx b/libstudxml/version.hxx
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/libstudxml/version.hxx