From 239dd1f70e16032ee27d1f040955b9b9c75d94f0 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Tue, 3 Oct 2017 23:44:19 +0300
Subject: Adapt to modularization of libbutl

---
 libbpkg/manifest.cxx                 | 10 +++++-----
 libbpkg/manifest.hxx                 |  4 ++--
 tests/manifest/driver.cxx            |  4 ++--
 tests/package-version/driver.cxx     |  4 ++--
 tests/repository-location/driver.cxx |  6 +++---
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/libbpkg/manifest.cxx b/libbpkg/manifest.cxx
index 1d953a3..e8034f3 100644
--- a/libbpkg/manifest.cxx
+++ b/libbpkg/manifest.cxx
@@ -15,12 +15,12 @@
 #include <algorithm> // find(), transform()
 #include <stdexcept> // invalid_argument
 
-#include <libbutl/path.hxx>
-#include <libbutl/base64.hxx>
-#include <libbutl/utility.hxx>             // casecmp(), lcase(), alpha(),
+#include <libbutl/path.mxx>
+#include <libbutl/base64.mxx>
+#include <libbutl/utility.mxx>             // casecmp(), lcase(), alpha(),
                                            // digit()
-#include <libbutl/manifest-parser.hxx>
-#include <libbutl/manifest-serializer.hxx>
+#include <libbutl/manifest-parser.mxx>
+#include <libbutl/manifest-serializer.mxx>
 
 using namespace std;
 using namespace butl;
diff --git a/libbpkg/manifest.hxx b/libbpkg/manifest.hxx
index 908eb81..a72986a 100644
--- a/libbpkg/manifest.hxx
+++ b/libbpkg/manifest.hxx
@@ -13,8 +13,8 @@
 #include <utility>   // move()
 #include <stdexcept> // logic_error
 
-#include <libbutl/path.hxx>
-#include <libbutl/optional.hxx>
+#include <libbutl/path.mxx>
+#include <libbutl/optional.mxx>
 #include <libbutl/manifest-forward.hxx>
 
 #include <libbpkg/export.hxx>
diff --git a/tests/manifest/driver.cxx b/tests/manifest/driver.cxx
index 4d87ee7..b7a87eb 100644
--- a/tests/manifest/driver.cxx
+++ b/tests/manifest/driver.cxx
@@ -7,8 +7,8 @@
 #include <cassert>
 #include <iostream>
 
-#include <libbutl/manifest-parser.hxx>
-#include <libbutl/manifest-serializer.hxx>
+#include <libbutl/manifest-parser.mxx>
+#include <libbutl/manifest-serializer.mxx>
 
 #include <libbpkg/manifest.hxx>
 
diff --git a/tests/package-version/driver.cxx b/tests/package-version/driver.cxx
index b39deb1..1cfad1e 100644
--- a/tests/package-version/driver.cxx
+++ b/tests/package-version/driver.cxx
@@ -9,8 +9,8 @@
 #include <exception>
 #include <stdexcept> // invalid_argument
 
-#include <libbutl/utility.hxx>  // operator<<(ostream, exception)
-#include <libbutl/optional.hxx>
+#include <libbutl/utility.mxx>  // operator<<(ostream, exception)
+#include <libbutl/optional.mxx>
 
 #include <libbpkg/manifest.hxx>
 
diff --git a/tests/repository-location/driver.cxx b/tests/repository-location/driver.cxx
index e459cab..a12adad 100644
--- a/tests/repository-location/driver.cxx
+++ b/tests/repository-location/driver.cxx
@@ -9,9 +9,9 @@
 #include <exception>
 #include <stdexcept> // invalid_argument
 
-#include <libbutl/utility.hxx>         // operator<<(ostream, exception)
-#include <libbutl/optional.hxx>
-#include <libbutl/manifest-parser.hxx>
+#include <libbutl/utility.mxx>         // operator<<(ostream, exception)
+#include <libbutl/optional.mxx>
+#include <libbutl/manifest-parser.mxx>
 
 #include <libbpkg/manifest.hxx>
 
-- 
cgit v1.1