aboutsummaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
Diffstat (limited to 'build')
-rw-r--r--build/bootstrap.build12
-rw-r--r--build/root.build1
2 files changed, 9 insertions, 4 deletions
diff --git a/build/bootstrap.build b/build/bootstrap.build
index 4a90389..0a20cb1 100644
--- a/build/bootstrap.build
+++ b/build/bootstrap.build
@@ -1,10 +1,16 @@
# file : build/bootstrap.build
-# copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
# license : MIT; see accompanying LICENSE file
project = build2-toolchain
-subprojects = libpkgconf libbutl build2 \
-libsqlite3 libodb libodb-sqlite libbpkg bpkg bdep
+
+amalgamation = # Disable amalgamation.
+
+# Note: list them (mostly) explicitly without using wildcards to handle stray
+# subdirectories in the root (debian/, installation location, etc).
+#
+subprojects += libbutl/ build2/ libbpkg/ bpkg/ bdep/
+subprojects += libbuild2-*/
+subprojects += tests/*/
using version
using config
diff --git a/build/root.build b/build/root.build
index 06343ed..f135851 100644
--- a/build/root.build
+++ b/build/root.build
@@ -1,5 +1,4 @@
# file : build/root.build
-# copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
# license : MIT; see accompanying LICENSE file
# Load common modules that are used by subproject so that they use common