From dc590f14ebe68a7f3c7c986e7ebb89df5270b9da Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Mon, 10 Sep 2018 15:07:38 +0300
Subject: Align with latest bdep-new

---
 libformat/.gitignore              |  2 --
 libformat/build/bootstrap.build   |  2 +-
 libformat/build/export.build      |  2 +-
 libformat/libformat/buildfile     | 14 ++++++++------
 libformat/tests/basics/buildfile  |  2 +-
 libformat/tests/basics/driver.cxx |  6 +++---
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/libformat/.gitignore b/libformat/.gitignore
index c3de2e7..cece09c 100644
--- a/libformat/.gitignore
+++ b/libformat/.gitignore
@@ -1,5 +1,3 @@
-.bdep/
-
 # Compiler/linker output.
 #
 *.d
diff --git a/libformat/build/bootstrap.build b/libformat/build/bootstrap.build
index 3351dc4..5e8df0b 100644
--- a/libformat/build/bootstrap.build
+++ b/libformat/build/bootstrap.build
@@ -3,5 +3,5 @@ project = libformat
 using version
 using config
 using test
-using dist
 using install
+using dist
diff --git a/libformat/build/export.build b/libformat/build/export.build
index 5a2e2ac..7ff098a 100644
--- a/libformat/build/export.build
+++ b/libformat/build/export.build
@@ -3,4 +3,4 @@ $out_root/
   include libformat/
 }
 
-export $out_root/libformat/lib{format}
+export $out_root/libformat/$import.target
diff --git a/libformat/libformat/buildfile b/libformat/libformat/buildfile
index 8d0535b..7b1797e 100644
--- a/libformat/libformat/buildfile
+++ b/libformat/libformat/buildfile
@@ -2,7 +2,7 @@ int_libs = # Interface dependencies.
 imp_libs = # Implementation dependencies.
 #import imp_libs += libhello%lib{hello}
 
-lib{format}: {hxx ixx txx cxx}{* -version} hxx{version} $imp_libs $int_libs
+lib{format}: {hxx ixx txx cxx}{** -version} hxx{version} $imp_libs $int_libs
 
 # Include the generated version header into the distribution (so that we don't
 # pick up an installed one) and don't remove it when cleaning in src (so that
@@ -13,18 +13,20 @@ hxx{version}: dist  = true
 hxx{version}: clean = ($src_root != $out_root)
 
 cxx.poptions =+ "-I$out_root" "-I$src_root"
+
+obja{*}: cxx.poptions += -DLIBFORMAT_STATIC_BUILD
+objs{*}: cxx.poptions += -DLIBFORMAT_SHARED_BUILD
+
 lib{format}: cxx.export.poptions = "-I$out_root" "-I$src_root"
 
 liba{format}: cxx.export.poptions += -DLIBFORMAT_STATIC
 libs{format}: cxx.export.poptions += -DLIBFORMAT_SHARED
 
-obja{*}: cxx.poptions += -DLIBFORMAT_STATIC_BUILD
-objs{*}: cxx.poptions += -DLIBFORMAT_SHARED_BUILD
-
 lib{format}: cxx.export.libs = $int_libs
 
 # For pre-releases use the complete version to make sure they cannot be used
-# in place of another pre-release or the final version.
+# in place of another pre-release or the final version. See the version module
+# for details on the version.* variable values.
 #
 if $version.pre_release
   lib{format}: bin.lib.version = @"-$version.project_id"
@@ -34,5 +36,5 @@ else
 # Install into the libformat/ subdirectory of, say, /usr/include/
 # recreating subdirectories.
 #
-{hxx ixx txx}{*}: install         = include/$project/
+{hxx ixx txx}{*}: install         = include/libformat/
 {hxx ixx txx}{*}: install.subdirs = true
diff --git a/libformat/tests/basics/buildfile b/libformat/tests/basics/buildfile
index 813cb7e..a16563e 100644
--- a/libformat/tests/basics/buildfile
+++ b/libformat/tests/basics/buildfile
@@ -1,3 +1,3 @@
 import libs = libformat%lib{format}
 
-exe{driver}: {hxx ixx txx cxx}{*} $libs
+exe{driver}: {hxx ixx txx cxx}{**} $libs testscript{**}
diff --git a/libformat/tests/basics/driver.cxx b/libformat/tests/basics/driver.cxx
index dbc9358..42b925a 100644
--- a/libformat/tests/basics/driver.cxx
+++ b/libformat/tests/basics/driver.cxx
@@ -4,11 +4,11 @@
 #include <libformat/version.hxx>
 #include <libformat/format.hxx>
 
-using namespace std;
-using namespace format;
-
 int main ()
 {
+  using namespace std;
+  using namespace format;
+
   // Basics.
   //
   assert (format_hello ("Hello", "World", volume::quiet)  == "hello, World!");
-- 
cgit v1.1