Convert to use utility library

1 files changed, 18 insertions, 17 deletions

diff --git a/bbot/buildfile b/bbot/buildfile
index a576cce..60f120f 100644
--- a/bbot/buildfile
+++ b/bbot/buildfile
@@ -5,7 +5,7 @@
 # Systemd .service file.
 #
 # @@ Currently the executable path is hardcoded as /usr/bin/bbot-agent. To
-#    handle this properly would need to generate/pre-process it )and detect
+#    handle this properly would need to generate/pre-process it (and detect
 #    update for install).
 #
 define service: file
@@ -24,18 +24,19 @@ if ($cxx.target.class == "linux")
 {
   ./: exe{bbot-agent} service{'bbot-agent@'}
 
-  exe{bbot-agent}: {hxx ixx txx cxx}{* +agent/* -**-options -version} \
-                   {hxx ixx cxx}{common-options agent/agent-options}  \
-                   {hxx}{version}                                     \
-                   $libs
+  exe{bbot-agent}: agent/{hxx ixx txx cxx}{* -agent-options} \
+                   agent/{hxx ixx cxx}{agent-options} libu{bbot}
 }
 
 ./: exe{bbot-worker}
 
-exe{bbot-worker}: {hxx ixx txx cxx}{* +worker/* -**-options -version} \
-                  {hxx ixx cxx}{common-options worker/worker-options} \
-                  {hxx}{version}                                      \
-                  $libs
+exe{bbot-worker}: worker/{hxx ixx txx cxx}{* -worker-options} \
+                  worker/{hxx ixx cxx}{worker-options} libu{bbot}
+
+libu{bbot}: bin.whole = false
+libu{bbot}: {hxx ixx txx cxx}{* -common-options -version} \
+            {hxx ixx cxx}{common-options} {hxx}{version}  \
+            $libs
 
 hxx{version}: in{version} $src_root/file{manifest}
 hxx{version}: dist = true
@@ -45,26 +46,26 @@ hxx{version}: dist = true
 if $cli.configured
 {
   cli.cxx{common-options}: cli{common}
-  cli.cxx{agent/agent-options}: cli{agent/agent}
-  cli.cxx{worker/worker-options}: cli{worker/worker}
+  agent/cli.cxx{agent-options}: cli{agent/agent}
+  worker/cli.cxx{worker-options}: cli{worker/worker}
 
   cli.options += -I $src_root --include-with-brackets           \
 --cxx-prologue "#include <bbot/types-parsers.hxx>"              \
 --cli-namespace bbot::cli --generate-specifier --generate-parse
 
-  cli.cxx{common-options}:                                             \
-  cli.options += --include-prefix bbot --guard-prefix BBOT # No usage.
+  cli.cxx{common-options}: cli.options += --include-prefix bbot \
+--guard-prefix BBOT # No usage.
 
   # Usage options.
   #
   cli.options += --suppress-undocumented --long-usage --ansi-color \
 --page-usage 'bbot::print_$name$_' --option-length 23
 
-  cli.cxx{agent/agent-options}:                                        \
-  cli.options += --include-prefix bbot/agent --guard-prefix BBOT_AGENT
+  agent/cli.cxx{agent-options}: cli.options += --include-prefix bbot/agent \
+--guard-prefix BBOT_AGENT
 
-  cli.cxx{worker/worker-options}:                                        \
-  cli.options += --include-prefix bbot/worker --guard-prefix BBOT_WORKER
+  worker/cli.cxx{worker-options}: cli.options += --include-prefix bbot/worker \
+--guard-prefix BBOT_WORKER
 
   # Include generated cli files into the distribution.
   #