diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2019-07-05 14:22:25 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2019-07-05 14:22:25 +0200 |
| commit | c1efbe3044b035db579976741ae50462b414eeae (patch) | |
| tree | cbdaad475ef0963216b118995368e5a642f2d036 /bootstrap.gmake | |
| parent | 57b10c06925d0bdf6ffb38488ee908f085109e95 (diff) | |
Update bootstrap script/batch/make files
Diffstat (limited to 'bootstrap.gmake')
| -rw-r--r-- | bootstrap.gmake | 15 |
1 files changed, 9 insertions, 6 deletions
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 |