aboutsummaryrefslogtreecommitdiff
path: root/libbpkg
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2017-05-01 17:09:14 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2017-05-01 17:09:14 +0300
commitf63ef29b7e09e9366d7eefaf0d82f21679bab399 (patch)
tree19288c890721d2d1ce9a5bfacc96bfce2655926e /libbpkg
parentc4d2ac250aee4102b519ce1db89bde3fe7855639 (diff)
Adapt to adding hxx extension for headers and lib prefix for library dir in libbutl
Diffstat (limited to 'libbpkg')
-rw-r--r--libbpkg/manifest.cxx11
-rw-r--r--libbpkg/manifest.hxx6
-rw-r--r--libbpkg/version.hxx.in2
3 files changed, 10 insertions, 9 deletions
diff --git a/libbpkg/manifest.cxx b/libbpkg/manifest.cxx
index 2b34695..b5b3f91 100644
--- a/libbpkg/manifest.cxx
+++ b/libbpkg/manifest.cxx
@@ -15,11 +15,12 @@
#include <algorithm> // find(), transform()
#include <stdexcept> // invalid_argument
-#include <butl/path>
-#include <butl/base64>
-#include <butl/utility> // casecmp(), lcase(), alpha(), digit()
-#include <butl/manifest-parser>
-#include <butl/manifest-serializer>
+#include <libbutl/path.hxx>
+#include <libbutl/base64.hxx>
+#include <libbutl/utility.hxx> // casecmp(), lcase(), alpha(),
+ // digit()
+#include <libbutl/manifest-parser.hxx>
+#include <libbutl/manifest-serializer.hxx>
using namespace std;
using namespace butl;
diff --git a/libbpkg/manifest.hxx b/libbpkg/manifest.hxx
index 1b8c694..1420cdb 100644
--- a/libbpkg/manifest.hxx
+++ b/libbpkg/manifest.hxx
@@ -13,9 +13,9 @@
#include <utility> // move()
#include <stdexcept> // logic_error
-#include <butl/path>
-#include <butl/optional>
-#include <butl/manifest-forward>
+#include <libbutl/path.hxx>
+#include <libbutl/optional.hxx>
+#include <libbutl/manifest-forward.hxx>
#include <libbpkg/export.hxx>
#include <libbpkg/version.hxx>
diff --git a/libbpkg/version.hxx.in b/libbpkg/version.hxx.in
index 26c6d95..0b63efe 100644
--- a/libbpkg/version.hxx.in
+++ b/libbpkg/version.hxx.in
@@ -37,7 +37,7 @@
#define LIBBPKG_SNAPSHOT $libbpkg.version.snapshot_sn$ULL
#define LIBBPKG_SNAPSHOT_ID "$libbpkg.version.snapshot_id$"
-#include <butl/version>
+#include <libbutl/version.hxx>
$libbutl.check(LIBBUTL_VERSION, LIBBUTL_SNAPSHOT)$