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

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

diff --git a/libhello/.gitignore b/libhello/.gitignore
index c3de2e7..cece09c 100644
--- a/libhello/.gitignore
+++ b/libhello/.gitignore
@@ -1,5 +1,3 @@
-.bdep/
-
 # Compiler/linker output.
 #
 *.d
diff --git a/libhello/build/bootstrap.build b/libhello/build/bootstrap.build
index adf8e92..861038b 100644
--- a/libhello/build/bootstrap.build
+++ b/libhello/build/bootstrap.build
@@ -3,5 +3,5 @@ project = libhello
 using version
 using config
 using test
-using dist
 using install
+using dist
diff --git a/libhello/build/export.build b/libhello/build/export.build
index e9c7bd9..626772c 100644
--- a/libhello/build/export.build
+++ b/libhello/build/export.build
@@ -3,4 +3,4 @@ $out_root/
   include libhello/
 }
 
-export $out_root/libhello/lib{hello}
+export $out_root/libhello/$import.target
diff --git a/libhello/libhello/buildfile b/libhello/libhello/buildfile
index 55a83bc..7640a50 100644
--- a/libhello/libhello/buildfile
+++ b/libhello/libhello/buildfile
@@ -1,7 +1,7 @@
 import int_libs = libformat%lib{format} # Interface dependency.
 import imp_libs = libprint%lib{print}   # Implementation dependency.
 
-lib{hello}: {hxx ixx txx cxx}{* -version} hxx{version} $imp_libs $int_libs
+lib{hello}: {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
@@ -12,18 +12,20 @@ hxx{version}: dist  = true
 hxx{version}: clean = ($src_root != $out_root)
 
 cxx.poptions =+ "-I$out_root" "-I$src_root"
+
+obja{*}: cxx.poptions += -DLIBHELLO_STATIC_BUILD
+objs{*}: cxx.poptions += -DLIBHELLO_SHARED_BUILD
+
 lib{hello}: cxx.export.poptions = "-I$out_root" "-I$src_root"
 
 liba{hello}: cxx.export.poptions += -DLIBHELLO_STATIC
 libs{hello}: cxx.export.poptions += -DLIBHELLO_SHARED
 
-obja{*}: cxx.poptions += -DLIBHELLO_STATIC_BUILD
-objs{*}: cxx.poptions += -DLIBHELLO_SHARED_BUILD
-
 lib{hello}: 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{hello}: bin.lib.version = @"-$version.project_id"
@@ -33,5 +35,5 @@ else
 # Install into the libhello/ subdirectory of, say, /usr/include/
 # recreating subdirectories.
 #
-{hxx ixx txx}{*}: install         = include/$project/
+{hxx ixx txx}{*}: install         = include/libhello/
 {hxx ixx txx}{*}: install.subdirs = true
diff --git a/libhello/tests/basics/buildfile b/libhello/tests/basics/buildfile
index a436a8c..e8cc422 100644
--- a/libhello/tests/basics/buildfile
+++ b/libhello/tests/basics/buildfile
@@ -1,3 +1,3 @@
 import libs = libhello%lib{hello}
 
-exe{driver}: {hxx ixx txx cxx}{*} $libs
+exe{driver}: {hxx ixx txx cxx}{**} $libs testscript{**}
diff --git a/libhello/tests/basics/driver.cxx b/libhello/tests/basics/driver.cxx
index 2cef70b..24c29a1 100644
--- a/libhello/tests/basics/driver.cxx
+++ b/libhello/tests/basics/driver.cxx
@@ -4,11 +4,11 @@
 #include <libhello/version.hxx>
 #include <libhello/hello.hxx>
 
-using namespace std;
-using namespace hello;
-
 int main ()
 {
+  using namespace std;
+  using namespace hello;
+
   // Basics.
   //
   {
-- 
cgit v1.1