From 8728018f93a73b08a68ab1cea502a5f6b4a2a79e Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 4 May 2018 15:35:08 +0200
Subject: Regenerate libformat using bdep-new

---
 libformat/libformat/buildfile | 39 ++++++++++++++++++++++++++++-----------
 1 file changed, 28 insertions(+), 11 deletions(-)

(limited to 'libformat/libformat/buildfile')

diff --git a/libformat/libformat/buildfile b/libformat/libformat/buildfile
index fc342d4..96f7133 100644
--- a/libformat/libformat/buildfile
+++ b/libformat/libformat/buildfile
@@ -1,4 +1,27 @@
-lib{format}: {hxx cxx}{format} hxx{export}
+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
+
+# 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
+# clean results in a state identical to distributed).
+#
+hxx{version}: in{version} $src_root/file{manifest}
+hxx{version}: dist  = true
+hxx{version}: clean = ($src_root != $out_root)
+
+cxx.poptions =+ "-I$out_root" "-I$src_root"
+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.
@@ -8,14 +31,8 @@ if $version.pre_release
 else
   lib{format}: bin.lib.version = @"-$version.major.$version.minor"
 
-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
-
-# Install into the libformat/ subdirectory of, say, /usr/include/.
+# Install into the libformat/ subdirectory of, say, /usr/include/
+# recreating subdirectories.
 #
-{hxx ixx txx}{*}: install = include/$project/
+{hxx ixx txx}{*}: install         = include/$project/
+{hxx ixx txx}{*}: install.subdirs = true
-- 
cgit v1.1