Fix cli distribution via group

1 files changed, 6 insertions, 8 deletions

diff --git a/build2/buildfile b/build2/buildfile
index a946bc7..a1c3d3d 100644
--- a/build2/buildfile
+++ b/build2/buildfile
@@ -110,10 +110,10 @@ if ($cxx.target.class != "windows")
 
 # Generated options parser.
 #
-{hxx ixx cxx}{b-options}: cli{b}
-
 if $cli.configured
 {
+  cli.cxx{b-options}: cli{b}
+
   cli.options += -I $src_root --include-with-brackets --include-prefix build2 \
 --guard-prefix BUILD2 --cxx-prologue "#include <build2/types-parsers>" \
 --cli-namespace build2::cl --generate-file-scanner --generate-parse \
@@ -123,10 +123,8 @@ if $cli.configured
   #
   cli.options += --suppress-undocumented --long-usage --ansi-color \
 --page-usage 'build2::print_$name$_' --option-length 20
-}
 
-# Include generated cli files into the distribution.
-#
-hxx{*-options}: dist = true
-ixx{*-options}: dist = true
-cxx{*-options}: dist = true
+  # Include generated cli files into the distribution.
+  #
+  cli.cxx{*}: dist = true
+}