Make use of wildcards in buildfiles

2 files changed, 9 insertions, 12 deletions

diff --git a/buildfile b/buildfile
index b0b2ee2..2ed54a0 100644
--- a/buildfile
+++ b/buildfile
@@ -2,6 +2,9 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
+# Note that the project directories order is important (prerequisites goes
+# first).
+#
 d = libbutl/ build2/ libsqlite3/ libodb/ libodb-sqlite/ libbpkg/ bpkg/ doc/
 
 i =               \
@@ -13,13 +16,12 @@ BOOTSTRAP-MSVC    \
 BOOTSTRAP-UNIX    \
 BOOTSTRAP-WINDOWS
 
-./: $d doc{$i README version} cli{$i} \
-  file{build.sh build-msvc.bat build-mingw.bat manifest}
+./: $d doc{$i README version} cli{$i} file{build.sh build-*} file{manifest}
 
 doc{version}: file{manifest} # Generated by the version module.
 doc{version}: dist = true
 
 # Don't install the BOOTSTRAP/INSTALL files. But UPGRADE could be useful.
 #
-doc{INSTALL}@./: install = false
+doc{INSTALL}@./:  install = false
 doc{BOOTSTRAP-*}: install = false
diff --git a/doc/buildfile b/doc/buildfile
index 8737908..f2b22f1 100644
--- a/doc/buildfile
+++ b/doc/buildfile
@@ -5,13 +5,8 @@
 define css: file
 css{*}: extension = css
 
-intr = build2-toolchain-intro
-inst = build2-toolchain-install
+./: doc{build2-toolchain-*}     \
+    css{code-box common doc pre-box toc} \
+    file{install.cli intro.cli doc-* *.html2ps}
 
-./: \
-doc{$(intr).xhtml $intr-a4.pdf $intr-a4.ps $intr-letter.pdf $intr-letter.ps} \
-doc{$(inst).xhtml $inst-a4.pdf $inst-a4.ps $inst-letter.pdf $inst-letter.ps} \
-css{code-box common doc pre-box toc}                                         \
-file{a4.html2ps letter.html2ps doc.html2ps}                                  \
-file{doc-prologue.xhtml doc-epilogue.xhtml}                                  \
-cli{intro.cli install.cli} file{cli.sh}
+./: file{cli.sh}