Adapt to adding hxx extension for headers and lib prefix for library dir in libbutl

5 files changed, 13 insertions, 13 deletions

diff --git a/libbrep/common.hxx b/libbrep/common.hxx
index b1160ab..942790c 100644
--- a/libbrep/common.hxx
+++ b/libbrep/common.hxx
@@ -108,8 +108,8 @@ namespace brep
                              std::chrono::nanoseconds::period>::value,
     "The following timestamp ODB mapping is invalid");
 
-  // As it pointed out in butl/timestamp we will overflow in year 2262, but
-  // by that time some larger basic type will be available for mapping.
+  // As it pointed out in libbutl/timestamp.hxx we will overflow in year 2262,
+  // but by that time some larger basic type will be available for mapping.
   //
   #pragma db map type(timestamp) as(uint64_t)                 \
     to(std::chrono::duration_cast<std::chrono::nanoseconds> ( \
diff --git a/libbrep/types.hxx b/libbrep/types.hxx
index a0001a7..7b74c75 100644
--- a/libbrep/types.hxx
+++ b/libbrep/types.hxx
@@ -22,10 +22,10 @@
 
 #include <odb/lazy-ptr.hxx>
 
-#include <butl/path>
-#include <butl/path-io>
-#include <butl/optional>
-#include <butl/timestamp>
+#include <libbutl/path.hxx>
+#include <libbutl/path-io.hxx>
+#include <libbutl/optional.hxx>
+#include <libbutl/timestamp.hxx>
 
 namespace brep
 {
@@ -65,7 +65,7 @@ namespace brep
   using std::system_error;
   using io_error = std::ios_base::failure;
 
-  // <butl/optional>
+  // <libbutl/optional.hxx>
   //
   using butl::optional;
   using butl::nullopt;
@@ -75,7 +75,7 @@ namespace brep
   using odb::lazy_shared_ptr;
   using odb::lazy_weak_ptr;
 
-  // <butl/path>
+  // <libbutl/path.hxx>
   //
   using butl::path;
   using butl::dir_path;
@@ -85,7 +85,7 @@ namespace brep
   using paths = std::vector<path>;
   using dir_paths = std::vector<dir_path>;
 
-  // <butl/timestamp>
+  // <libbutl/timestamp.hxx>
   //
   using butl::timestamp;
   using butl::timestamp_nonexistent;
diff --git a/libbrep/utility.hxx b/libbrep/utility.hxx
index f5948dd..c81413c 100644
--- a/libbrep/utility.hxx
+++ b/libbrep/utility.hxx
@@ -11,7 +11,7 @@
 #include <cassert>  // assert()
 #include <iterator> // make_move_iterator()
 
-#include <butl/utility> // reverse_iterate(), operator<<(ostream, exception)
+#include <libbutl/utility.hxx> // reverse_iterate(), operator<<(ostream, exception)
 
 namespace brep
 {
@@ -24,7 +24,7 @@ namespace brep
   using std::make_move_iterator;
   using std::to_string;
 
-  // <butl/utility>
+  // <libbutl/utility.hxx>
   //
   using butl::reverse_iterate;
 }
diff --git a/libbrep/version.hxx.in b/libbrep/version.hxx.in
index 0b83777..e3c52ce 100644
--- a/libbrep/version.hxx.in
+++ b/libbrep/version.hxx.in
@@ -37,7 +37,7 @@
 #define BREP_SNAPSHOT      $brep.version.snapshot_sn$ULL
 #define BREP_SNAPSHOT_ID   "$brep.version.snapshot_id$"
 
-#include <butl/version>
+#include <libbutl/version.hxx>
 
 $libbutl.check(LIBBUTL_VERSION, LIBBUTL_SNAPSHOT)$
 
diff --git a/libbrep/wrapper-traits.hxx b/libbrep/wrapper-traits.hxx
index ac039e3..fcc63c6 100644
--- a/libbrep/wrapper-traits.hxx
+++ b/libbrep/wrapper-traits.hxx
@@ -7,7 +7,7 @@
 
 #include <odb/pre.hxx>
 
-#include <butl/optional>
+#include <libbutl/optional.hxx>
 
 #include <odb/wrapper-traits.hxx>