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

---
 libbpkg/manifest.cxx                 | 11 ++++++-----
 libbpkg/manifest.hxx                 |  6 +++---
 libbpkg/version.hxx.in               |  2 +-
 tests/manifest/driver.cxx            |  4 ++--
 tests/package-version/driver.cxx     |  4 ++--
 tests/repository-location/driver.cxx |  6 +++---
 6 files changed, 17 insertions(+), 16 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)$
 
diff --git a/tests/manifest/driver.cxx b/tests/manifest/driver.cxx
index 157546e..4d87ee7 100644
--- a/tests/manifest/driver.cxx
+++ b/tests/manifest/driver.cxx
@@ -7,8 +7,8 @@
 #include <cassert>
 #include <iostream>
 
-#include <butl/manifest-parser>
-#include <butl/manifest-serializer>
+#include <libbutl/manifest-parser.hxx>
+#include <libbutl/manifest-serializer.hxx>
 
 #include <libbpkg/manifest.hxx>
 
diff --git a/tests/package-version/driver.cxx b/tests/package-version/driver.cxx
index 4659db9..2ca318b 100644
--- a/tests/package-version/driver.cxx
+++ b/tests/package-version/driver.cxx
@@ -9,8 +9,8 @@
 #include <exception>
 #include <stdexcept> // invalid_argument
 
-#include <butl/utility>  // operator<<(ostream, exception)
-#include <butl/optional>
+#include <libbutl/utility.hxx>  // operator<<(ostream, exception)
+#include <libbutl/optional.hxx>
 
 #include <libbpkg/manifest.hxx>
 
diff --git a/tests/repository-location/driver.cxx b/tests/repository-location/driver.cxx
index 3122393..c77a4eb 100644
--- a/tests/repository-location/driver.cxx
+++ b/tests/repository-location/driver.cxx
@@ -9,9 +9,9 @@
 #include <exception>
 #include <stdexcept> // invalid_argument
 
-#include <butl/utility>         // operator<<(ostream, exception)
-#include <butl/optional>
-#include <butl/manifest-parser>
+#include <libbutl/utility.hxx>         // operator<<(ostream, exception)
+#include <libbutl/optional.hxx>
+#include <libbutl/manifest-parser.hxx>
 
 #include <libbpkg/manifest.hxx>
 
-- 
cgit v1.1