summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2018-12-04 12:02:49 (GMT)
committerKaren Arutyunov <karen@codesynthesis.com>2018-12-04 12:02:49 (GMT)
commit933d4616f91ff44db8d5a6a80c52d15e02e3b933 (patch)
tree27baeff9c5fce711a2cb4bc46de58a9f15e0d8fc
parentbf23a7974e861787037288cafcdea1692b96825c (diff)
Align with latest bdep-new
-rw-r--r--.gitignore2
-rw-r--r--libhello/libhello/buildfile26
2 files changed, 21 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..392d774
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.bdep/
+
diff --git a/libhello/libhello/buildfile b/libhello/libhello/buildfile
index 7640a50..a80de51 100644
--- a/libhello/libhello/buildfile
+++ b/libhello/libhello/buildfile
@@ -8,21 +8,30 @@ lib{hello}: {hxx ixx txx cxx}{** -version} hxx{version} $imp_libs $int_libs
# clean results in a state identical to distributed).
#
hxx{version}: in{version} $src_root/manifest
-hxx{version}: dist = true
-hxx{version}: clean = ($src_root != $out_root)
+hxx{version}:
+{
+ dist = true
+ clean = ($src_root != $out_root)
+}
+# Build options.
+#
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"
+# Export options.
+#
+lib{hello}:
+{
+ cxx.export.poptions = "-I$out_root" "-I$src_root"
+ cxx.export.libs = $int_libs
+}
liba{hello}: cxx.export.poptions += -DLIBHELLO_STATIC
libs{hello}: cxx.export.poptions += -DLIBHELLO_SHARED
-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. See the version module
# for details on the version.* variable values.
@@ -35,5 +44,8 @@ else
# Install into the libhello/ subdirectory of, say, /usr/include/
# recreating subdirectories.
#
-{hxx ixx txx}{*}: install = include/libhello/
-{hxx ixx txx}{*}: install.subdirs = true
+{hxx ixx txx}{*}:
+{
+ install = include/libhello/
+ install.subdirs = true
+}