Make use of wildcards in buildfiles

2 files changed, 7 insertions, 18 deletions

diff --git a/doc/buildfile b/doc/buildfile
index c11de50..9131de2 100644
--- a/doc/buildfile
+++ b/doc/buildfile
@@ -2,29 +2,18 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : TBC; see accompanying LICENSE file
 
-cmds =             \
-bbot-agent 	   \
-bbot-worker
-
 define css: file
 css{*}: extension = css
 
 define xhtml: doc
 xhtml{*}: extension = xhtml
 
-./: {man1 xhtml}{$cmds}                         \
-    css{common pre-box man}                     \
-    file{man-prologue.1 man-epilogue.1          \
-         man-prologue.xhtml man-epilogue.xhtml}
+./: {man1 xhtml}{bbot-*}    \
+    css{common pre-box man} \
+    file{man-*}
 
-./: doc{build2-build-bot-manual.xhtml           \
-        build2-build-bot-manual-a4.pdf          \
-	build2-build-bot-manual-a4.ps           \
-        build2-build-bot-manual-letter.pdf      \
-	build2-build-bot-manual-letter.ps}      \
-    css{code-box common doc pre-box toc} 	\
-    file{a4.html2ps letter.html2ps doc.html2ps} \
-    file{doc-prologue.xhtml doc-epilogue.xhtml  \
-         manual.cli}
+./: doc{build2-build-bot-manual*}        \
+    css{code-box common doc pre-box toc} \
+    file{manual.cli doc-* *.html2ps}
 
 ./: file{cli.sh}
diff --git a/doc/cli.sh b/doc/cli.sh
index 2a5136d..e8a06c8 100755
--- a/doc/cli.sh
+++ b/doc/cli.sh
@@ -51,7 +51,7 @@ o="--output-prefix bbot-"
 #
 #compile "bbot" $o --output-prefix ""
 
-pages="bbot/agent bbot/worker"
+pages="bbot/agent/agent bbot/worker/worker"
 
 for p in $pages; do
   compile $p $o