Update bootstrap script/batch/make files

4 files changed, 30 insertions, 21 deletions

diff --git a/bootstrap-mingw.bat b/bootstrap-mingw.bat
index e2b51b7..73b76f3 100644
--- a/bootstrap-mingw.bat
+++ b/bootstrap-mingw.bat
@@ -61,18 +61,20 @@ if "_%libbutl%_" == "__" (
 rem All the source directories.
 rem
 set "src=build2"
-set "src=%src% build2\config"
-set "src=%src% build2\dist"
 set "src=%src% build2\bin"
 set "src=%src% build2\c"
 set "src=%src% build2\cc"
 set "src=%src% build2\cxx"
-set "src=%src% build2\test"
-set "src=%src% build2\test\script"
 set "src=%src% build2\version"
-set "src=%src% build2\install"
 set "src=%src% build2\in"
+
 set "src=%src% libbuild2"
+set "src=%src% libbuild2\config"
+set "src=%src% libbuild2\dist"
+set "src=%src% libbuild2\test"
+set "src=%src% libbuild2\test\script"
+set "src=%src% libbuild2\install"
+
 set "src=%src% %libbutl%\libbutl"
 
 rem Get the compile options.
diff --git a/bootstrap-msvc.bat b/bootstrap-msvc.bat
index 603395c..a011162 100644
--- a/bootstrap-msvc.bat
+++ b/bootstrap-msvc.bat
@@ -92,18 +92,20 @@ if "_%libbutl%_" == "__" (
 rem All the source directories.
 rem
 set "src=build2"
-set "src=%src% build2\config"
-set "src=%src% build2\dist"
 set "src=%src% build2\bin"
 set "src=%src% build2\c"
 set "src=%src% build2\cc"
 set "src=%src% build2\cxx"
-set "src=%src% build2\test"
-set "src=%src% build2\test\script"
 set "src=%src% build2\version"
-set "src=%src% build2\install"
 set "src=%src% build2\in"
+
 set "src=%src% libbuild2"
+set "src=%src% libbuild2\config"
+set "src=%src% libbuild2\dist"
+set "src=%src% libbuild2\test"
+set "src=%src% libbuild2\test\script"
+set "src=%src% libbuild2\install"
+
 set "src=%src% %libbutl%\libbutl"
 
 rem Get the compile options.
diff --git a/bootstrap.gmake b/bootstrap.gmake
index e2fea35..04716be 100644
--- a/bootstrap.gmake
+++ b/bootstrap.gmake
@@ -130,21 +130,24 @@ endif
 # Note: list nested subdirectories first (used in clean).
 #
 build2_sub := \
-config        \
-dist          \
 bin           \
 c             \
 cc            \
 cxx           \
-test/script   \
-test          \
 version       \
-install       \
 in
 
+libbuild2_sub := \
+config           \
+dist             \
+test/script      \
+test             \
+install
+
 build2_src    := $(wildcard $(src_root)/build2/*.cxx)
 build2_src    += $(foreach d,$(build2_sub),$(wildcard $(src_root)/build2/$d/*.cxx))
 libbuild2_src := $(wildcard $(src_root)/libbuild2/*.cxx)
+libbuild2_src += $(foreach d,$(libbuild2_sub),$(wildcard $(src_root)/libbuild2/$d/*.cxx))
 libbutl_src   := $(wildcard $(libbutl)/libbutl/*.cxx)
 
 # Filter out *.test.cxx sources.
@@ -193,5 +196,5 @@ cleano:
 clean: cleano
 	rm -f $(out_root)/build2/b-boot$(exe)
 ifeq ($(in_tree),false)
-	rm -fd $(foreach d,$(build2_sub),$(out_root)/build2/$d) $(out_root)/build2 $(out_root)/libbuild2 $(libbutl_out)
+	rm -fd $(foreach d,$(build2_sub),$(out_root)/build2/$d) $(out_root)/build2 $(foreach d,$(libbuild2_sub),$(out_root)/libbuild2/$d) $(out_root)/libbuild2 $(libbutl_out)
 endif
diff --git a/bootstrap.sh b/bootstrap.sh
index 4cacd74..51e5e9d 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -117,20 +117,22 @@ if test -z "$libbutl"; then
 fi
 
 src="build2/*.cxx"
-src="$src build2/config/*.cxx"
-src="$src build2/dist/*.cxx"
 src="$src build2/bin/*.cxx"
 src="$src build2/c/*.cxx"
 src="$src build2/cc/*.cxx"
 src="$src build2/cxx/*.cxx"
 src="$src build2/cli/*.cxx"
-src="$src build2/test/*.cxx"
-src="$src build2/test/script/*.cxx"
 src="$src build2/version/*.cxx"
-src="$src build2/install/*.cxx"
 src="$src build2/in/*.cxx"
 src="$src build2/bash/*.cxx"
+
 src="$src libbuild2/*.cxx"
+src="$src libbuild2/config/*.cxx"
+src="$src libbuild2/dist/*.cxx"
+src="$src libbuild2/test/*.cxx"
+src="$src libbuild2/test/script/*.cxx"
+src="$src libbuild2/install/*.cxx"
+
 src="$src $libbutl/libbutl/*.cxx"
 
 # Filter out *.test.cxx sources.