Move project into intermediate sub-directory

20 files changed, 26 insertions, 26 deletions

diff --git a/buildfile b/buildfile
deleted file mode 100644
index 5dd2544..0000000
--- a/buildfile
+++ /dev/null
@@ -1,8 +0,0 @@
-./: libprint/ tests/ doc{version} file{manifest}
-
-doc{version}: file{manifest} # Generated by the version module.
-doc{version}: dist = true
-
-# Don't install tests.
-#
-dir{tests/}: install = false
diff --git a/.gitignore b/libprint/.gitignore
index a887fdd..a887fdd 100644
--- a/.gitignore
+++ b/libprint/.gitignore
diff --git a/build/.gitignore b/libprint/build/.gitignore
index 225c27f..225c27f 100644
--- a/build/.gitignore
+++ b/libprint/build/.gitignore
diff --git a/build/bootstrap.build b/libprint/build/bootstrap.build
index 1941f1a..1941f1a 100644
--- a/build/bootstrap.build
+++ b/libprint/build/bootstrap.build
diff --git a/build/export.build b/libprint/build/export.build
index 4871c4a..4871c4a 100644
--- a/build/export.build
+++ b/libprint/build/export.build
diff --git a/build/root.build b/libprint/build/root.build
index 8ceadfa..8ceadfa 100644
--- a/build/root.build
+++ b/libprint/build/root.build
diff --git a/libprint/buildfile b/libprint/buildfile
index f7d8a74..5dd2544 100644
--- a/libprint/buildfile
+++ b/libprint/buildfile
@@ -1,21 +1,8 @@
-lib{print}: {hxx cxx}{print} hxx{export}
+./: libprint/ tests/ doc{version} file{manifest}
 
-# For pre-releases use the complete version to make sure they cannot be used
-# in place of another pre-release or the final version.
-#
-if $version.pre_release
-  lib{print}: bin.lib.version = @"-$version.project_id"
-else
-  lib{print}: bin.lib.version = @"-$version.major.$version.minor"
-
-cxx.poptions =+ "-I$out_root" "-I$src_root"
-obja{*}: cxx.poptions += -DLIBPRINT_STATIC_BUILD
-objs{*}: cxx.poptions += -DLIBPRINT_SHARED_BUILD
-
-lib{print}: cxx.export.poptions = "-I$out_root" "-I$src_root"
-liba{print}: cxx.export.poptions += -DLIBPRINT_STATIC
-libs{print}: cxx.export.poptions += -DLIBPRINT_SHARED
+doc{version}: file{manifest} # Generated by the version module.
+doc{version}: dist = true
 
-# Install into the libprint/ subdirectory of, say, /usr/include/.
+# Don't install tests.
 #
-install.include = $install.include/libprint/
+dir{tests/}: install = false
diff --git a/libprint/libprint/buildfile b/libprint/libprint/buildfile
new file mode 100644
index 0000000..f7d8a74
--- /dev/null
+++ b/libprint/libprint/buildfile
@@ -0,0 +1,21 @@
+lib{print}: {hxx cxx}{print} hxx{export}
+
+# For pre-releases use the complete version to make sure they cannot be used
+# in place of another pre-release or the final version.
+#
+if $version.pre_release
+  lib{print}: bin.lib.version = @"-$version.project_id"
+else
+  lib{print}: bin.lib.version = @"-$version.major.$version.minor"
+
+cxx.poptions =+ "-I$out_root" "-I$src_root"
+obja{*}: cxx.poptions += -DLIBPRINT_STATIC_BUILD
+objs{*}: cxx.poptions += -DLIBPRINT_SHARED_BUILD
+
+lib{print}: cxx.export.poptions = "-I$out_root" "-I$src_root"
+liba{print}: cxx.export.poptions += -DLIBPRINT_STATIC
+libs{print}: cxx.export.poptions += -DLIBPRINT_SHARED
+
+# Install into the libprint/ subdirectory of, say, /usr/include/.
+#
+install.include = $install.include/libprint/
diff --git a/libprint/export.hxx b/libprint/libprint/export.hxx
index dedfa65..dedfa65 100644
--- a/libprint/export.hxx
+++ b/libprint/libprint/export.hxx
diff --git a/libprint/print.cxx b/libprint/libprint/print.cxx
index 32c827d..32c827d 100644
--- a/libprint/print.cxx
+++ b/libprint/libprint/print.cxx
diff --git a/libprint/print.hxx b/libprint/libprint/print.hxx
index 63cb541..63cb541 100644
--- a/libprint/print.hxx
+++ b/libprint/libprint/print.hxx
diff --git a/manifest b/libprint/manifest
index f32d236..f32d236 100644
--- a/manifest
+++ b/libprint/manifest
diff --git a/tests/.gitignore b/libprint/tests/.gitignore
index e54525b..e54525b 100644
--- a/tests/.gitignore
+++ b/libprint/tests/.gitignore
diff --git a/tests/build/.gitignore b/libprint/tests/build/.gitignore
index 225c27f..225c27f 100644
--- a/tests/build/.gitignore
+++ b/libprint/tests/build/.gitignore
diff --git a/tests/build/bootstrap.build b/libprint/tests/build/bootstrap.build
index 2c2de24..2c2de24 100644
--- a/tests/build/bootstrap.build
+++ b/libprint/tests/build/bootstrap.build
diff --git a/tests/build/root.build b/libprint/tests/build/root.build
index a2ee38a..a2ee38a 100644
--- a/tests/build/root.build
+++ b/libprint/tests/build/root.build
diff --git a/tests/buildfile b/libprint/tests/buildfile
index 1a8bcc9..1a8bcc9 100644
--- a/tests/buildfile
+++ b/libprint/tests/buildfile
diff --git a/tests/test/buildfile b/libprint/tests/test/buildfile
index c5bfff4..c5bfff4 100644
--- a/tests/test/buildfile
+++ b/libprint/tests/test/buildfile
diff --git a/tests/test/driver.cxx b/libprint/tests/test/driver.cxx
index 27f491d..27f491d 100644
--- a/tests/test/driver.cxx
+++ b/libprint/tests/test/driver.cxx
diff --git a/tests/test/test.out b/libprint/tests/test/test.out
index 8ab686e..8ab686e 100644
--- a/tests/test/test.out
+++ b/libprint/tests/test/test.out