From 56753fab91751a19fdfcc4695a0eec73c4186dc3 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Mon, 1 May 2017 17:19:38 +0300
Subject: Adapt to adding hxx extension for headers and lib prefix for library
 dir in libbutl

---
 libbbot/build-config.cxx  |  6 +++---
 libbbot/build-config.hxx  |  8 ++++----
 libbbot/manifest.cxx      | 10 +++++-----
 libbbot/manifest.hxx      |  6 +++---
 libbbot/version.hxx.in    |  2 +-
 tests/buildtab/driver.cxx |  2 +-
 tests/manifest/driver.cxx |  6 +++---
 7 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/libbbot/build-config.cxx b/libbbot/build-config.cxx
index d902d42..071ad7f 100644
--- a/libbbot/build-config.cxx
+++ b/libbbot/build-config.cxx
@@ -9,9 +9,9 @@
 #include <utility>   // move()
 #include <stdexcept> // invalid_argument
 
-#include <butl/path>
-#include <butl/fdstream>
-#include <butl/tab-parser>
+#include <libbutl/path.hxx>
+#include <libbutl/fdstream.hxx>
+#include <libbutl/tab-parser.hxx>
 
 #include <libbbot/manifest.hxx> // task_manifest::check_config()
 
diff --git a/libbbot/build-config.hxx b/libbbot/build-config.hxx
index 8a2e2d7..2e96e03 100644
--- a/libbbot/build-config.hxx
+++ b/libbbot/build-config.hxx
@@ -9,10 +9,10 @@
 #include <vector>
 #include <iosfwd>
 
-#include <butl/path>
-#include <butl/optional>
-#include <butl/tab-parser>
-#include <butl/target-triplet>
+#include <libbutl/path.hxx>
+#include <libbutl/optional.hxx>
+#include <libbutl/tab-parser.hxx>
+#include <libbutl/target-triplet.hxx>
 
 #include <libbbot/export.hxx>
 #include <libbbot/version.hxx>
diff --git a/libbbot/manifest.cxx b/libbbot/manifest.cxx
index 3ea9d19..89412d7 100644
--- a/libbbot/manifest.cxx
+++ b/libbbot/manifest.cxx
@@ -14,11 +14,11 @@
 #include <cstdint>   // uint64_t
 #include <stdexcept> // invalid_argument
 
-#include <butl/utility>             // digit()
-#include <butl/tab-parser>
-#include <butl/string-parser>
-#include <butl/manifest-parser>
-#include <butl/manifest-serializer>
+#include <libbutl/utility.hxx>             // digit()
+#include <libbutl/tab-parser.hxx>
+#include <libbutl/string-parser.hxx>
+#include <libbutl/manifest-parser.hxx>
+#include <libbutl/manifest-serializer.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/libbbot/manifest.hxx b/libbbot/manifest.hxx
index 1d86763..551e5f1 100644
--- a/libbbot/manifest.hxx
+++ b/libbbot/manifest.hxx
@@ -9,9 +9,9 @@
 #include <vector>
 #include <ostream>
 
-#include <butl/optional>
-#include <butl/target-triplet>
-#include <butl/manifest-forward>
+#include <libbutl/optional.hxx>
+#include <libbutl/target-triplet.hxx>
+#include <libbutl/manifest-forward.hxx>
 
 #include <libbpkg/manifest.hxx> // version, repository_location
 
diff --git a/libbbot/version.hxx.in b/libbbot/version.hxx.in
index 62be656..cae4e34 100644
--- a/libbbot/version.hxx.in
+++ b/libbbot/version.hxx.in
@@ -37,7 +37,7 @@
 #define LIBBBOT_SNAPSHOT      $libbbot.version.snapshot_sn$ULL
 #define LIBBBOT_SNAPSHOT_ID   "$libbbot.version.snapshot_id$"
 
-#include <butl/version>
+#include <libbutl/version.hxx>
 
 $libbutl.check(LIBBUTL_VERSION, LIBBUTL_SNAPSHOT)$
 
diff --git a/tests/buildtab/driver.cxx b/tests/buildtab/driver.cxx
index 28c48fb..e470780 100644
--- a/tests/buildtab/driver.cxx
+++ b/tests/buildtab/driver.cxx
@@ -6,7 +6,7 @@
 #include <cassert>
 #include <iostream>
 
-#include <butl/utility> // operator<<(ostream,exception)
+#include <libbutl/utility.hxx> // operator<<(ostream,exception)
 
 #include <libbbot/build-config.hxx>
 
diff --git a/tests/manifest/driver.cxx b/tests/manifest/driver.cxx
index fb58b27..1fc1230 100644
--- a/tests/manifest/driver.cxx
+++ b/tests/manifest/driver.cxx
@@ -7,9 +7,9 @@
 #include <cassert>
 #include <iostream>
 
-#include <butl/utility>             // operator<<(ostream,exception)
-#include <butl/manifest-parser>
-#include <butl/manifest-serializer>
+#include <libbutl/utility.hxx>             // operator<<(ostream,exception)
+#include <libbutl/manifest-parser.hxx>
+#include <libbutl/manifest-serializer.hxx>
 
 #include <libbbot/manifest.hxx>
 
-- 
cgit v1.1