From 1d1335b5ff32c55aad049617d92fe1bbced46572 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Wed, 31 Aug 2016 00:38:12 +0300
Subject: Build infrastructure update

---
 bpkg/buildfile | 29 ++++++++---------------------
 1 file changed, 8 insertions(+), 21 deletions(-)

(limited to 'bpkg/buildfile')

diff --git a/bpkg/buildfile b/bpkg/buildfile
index 551e9c0..0835798 100644
--- a/bpkg/buildfile
+++ b/bpkg/buildfile
@@ -52,7 +52,7 @@ exe{bpkg}:                                                                    \
 {hxx         cxx}{ types-parsers     }                                        \
 {hxx         cxx}{ utility           }                                        \
 {hxx            }{ wrapper-traits    }                                        \
-$libs
+                   $libs
 
 # Disable VC "unknown pragma" warning.
 #
@@ -61,26 +61,8 @@ if ($cxx.id == "msvc")
 
 obj{utility}: cxx.poptions += -DBPKG_EXE_SUFFIX='"'$bin.exe.suffix'"'
 
-# Load the cli module but only if it's available. This way a distribution
-# that includes pre-generated files can be built without installing cli.
-# This is also the reason why above we explicitly spelled out individual
-# source files instead of using the cli.cxx{} group (it won't be there
-# unless the module is loaded).
+# General topics and common options.
 #
-using? cli
-
-if! $cli.loaded
-{
-  define cli: file
-  cli{*}: extension = cli
-}
-
-# Include generated cli files into the distribution.
-#
-hxx{*-options}: dist = true
-ixx{*-options}: dist = true
-cxx{*-options}: dist = true
-
 {hxx ixx cxx}{common-options}:        cli{common}
 {hxx ixx cxx}{configuration-options}: cli{configuration}
 {hxx ixx cxx}{bpkg-options}:          cli{bpkg}
@@ -91,7 +73,6 @@ cxx{*-options}: dist = true
 
 # pkg-* command.
 #
-
 {hxx ixx cxx}{pkg-build-options}:     cli{pkg-build}
 {hxx ixx cxx}{pkg-clean-options}:     cli{pkg-clean}
 {hxx ixx cxx}{pkg-configure-options}: cli{pkg-configure}
@@ -139,3 +120,9 @@ cli.options += --long-usage # All other pages -- long usage.
 # Avoid generating CLI runtime and empty inline file for help topics.
 #
 cli.cxx{repository-signing}: cli.options += --suppress-cli --suppress-inline
+
+# Include generated cli files into the distribution.
+#
+hxx{*-options}: dist = true
+ixx{*-options}: dist = true
+cxx{*-options}: dist = true
-- 
cgit v1.1