From 05216e9cbe22690ec45f0ca2665d3b1ee7dedb55 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 4 Jun 2010 16:26:37 +0200
Subject: Update CLI import stub

---
 build/import/cli/cli-cxx.make | 15 +++++++++------
 build/import/cli/configure    |  8 ++++----
 2 files changed, 13 insertions(+), 10 deletions(-)

(limited to 'build')

diff --git a/build/import/cli/cli-cxx.make b/build/import/cli/cli-cxx.make
index 73ec32c..cb60d37 100644
--- a/build/import/cli/cli-cxx.make
+++ b/build/import/cli/cli-cxx.make
@@ -11,11 +11,15 @@
 #
 $(call include,$(bld_root)/cxx/configuration-static.make)
 
-cli_pattern :=                    \
-$(out_base)/%.$(cxx_s_suffix)     \
-$(out_base)/%.$(cxx_h_suffix)     \
-$(out_base)/%.$(cxx_i_suffix)     \
-$(out_base)/%-fwd.$(cxx_h_suffix)
+cli_pattern :=                \
+$(out_base)/%.$(cxx_s_suffix) \
+$(out_base)/%.$(cxx_h_suffix) \
+$(out_base)/%.$(cxx_i_suffix)
+
+$(cli_pattern): cli_options := \
+--hxx-suffix .$(cxx_h_suffix)  \
+--ixx-suffix .$(cxx_i_suffix)  \
+--cxx-suffix .$(cxx_s_suffix)
 
 .PRECIOUS: $(cli_pattern)
 
@@ -39,4 +43,3 @@ $(out_base)/%.cxx.cli.clean:
 	$(call message,rm $$1,rm -f $$1,$(@:.cxx.cli.clean=.$(cxx_s_suffix)))
 	$(call message,rm $$1,rm -f $$1,$(@:.cxx.cli.clean=.$(cxx_h_suffix)))
 	$(call message,rm $$1,rm -f $$1,$(@:.cxx.cli.clean=.$(cxx_i_suffix)))
-	$(call message,rm $$1,rm -f $$1,$(@:.cxx.cli.clean=-fwd.$(cxx_h_suffix)))
diff --git a/build/import/cli/configure b/build/import/cli/configure
index 23f3080..21a09c5 100755
--- a/build/import/cli/configure
+++ b/build/import/cli/configure
@@ -16,12 +16,12 @@ source $bld_root/dialog.bash
 
 
 $echo
-$echo "Configuring external dependency on 'CLI' for '$project_name'."
+$echo "Configuring external dependency on 'cli' for '$project_name'."
 $echo
 
 $echo
 $echo "Would you like to configure dependency on the installed "
-$echo "version of 'CLI' as opposed to the development build?"
+$echo "version of 'cli' as opposed to the development build?"
 $echo
 
 installed=`read_y_n y`
@@ -31,13 +31,13 @@ path=
 if [ "$installed" = "n" ]; then
 
 $echo
-$echo "Please enter the src_root for 'CLI'."
+$echo "Please enter the src_root for 'cli'."
 $echo
 
 src_root=`read_path --directory --exist`
 
 $echo
-$echo "Please enter the out_root for 'CLI'."
+$echo "Please enter the out_root for 'cli'."
 $eche
 
 out_root=`read_path --directory $src_root`
-- 
cgit v1.1