From ef95ba9ac39a9eea558a02cba94d8a141ddec5bf Mon Sep 17 00:00:00 2001
From: Gav Wood <i@gavwood.com>
Date: Mon, 26 May 2014 11:22:19 +0200
Subject: [PATCH] Major reorganisation. New libs (libethsupport, libevm,
 liblll). New LLLC binary.

---
 MemTrie.cpp   | 4 ++--
 MemTrie.h     | 4 ++--
 TrieHash.cpp  | 4 ++--
 TrieHash.h    | 4 ++--
 crypto.cpp    | 6 +++---
 dagger.cpp    | 4 ++--
 hexPrefix.cpp | 4 ++--
 main.cpp      | 4 ++--
 rlp.cpp       | 6 +++---
 trie.cpp      | 2 +-
 vm.cpp        | 9 +++++----
 11 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/MemTrie.cpp b/MemTrie.cpp
index c9e4fd8f0..d7f4e7d02 100644
--- a/MemTrie.cpp
+++ b/MemTrie.cpp
@@ -21,8 +21,8 @@
 
 #include "MemTrie.h"
 
-#include <libethcore/TrieCommon.h>
-#include <libethereum/CommonEth.h>
+#include <libethsupport/TrieCommon.h>
+#include <libethcore/CommonEth.h>
 using namespace std;
 using namespace eth;
 
diff --git a/MemTrie.h b/MemTrie.h
index 5c6a70276..7a9237592 100644
--- a/MemTrie.h
+++ b/MemTrie.h
@@ -21,8 +21,8 @@
 
 #pragma once
 
-#include <libethcore/Common.h>
-#include <libethcore/FixedHash.h>
+#include <libethsupport/Common.h>
+#include <libethsupport/FixedHash.h>
 
 namespace eth
 {
diff --git a/TrieHash.cpp b/TrieHash.cpp
index b12b96dd3..f6b730140 100644
--- a/TrieHash.cpp
+++ b/TrieHash.cpp
@@ -21,8 +21,8 @@
 
 #include "TrieHash.h"
 
-#include <libethcore/TrieCommon.h>
-#include <libethereum/CommonEth.h>
+#include <libethsupport/TrieCommon.h>
+#include <libethcore/CommonEth.h>
 using namespace std;
 using namespace eth;
 
diff --git a/TrieHash.h b/TrieHash.h
index f5e8564b4..f226f2d75 100644
--- a/TrieHash.h
+++ b/TrieHash.h
@@ -21,8 +21,8 @@
 
 #pragma once
 
-#include <libethcore/Common.h>
-#include <libethcore/FixedHash.h>
+#include <libethsupport/Common.h>
+#include <libethsupport/FixedHash.h>
 
 namespace eth
 {
diff --git a/crypto.cpp b/crypto.cpp
index 720bc7ffc..53be1db15 100644
--- a/crypto.cpp
+++ b/crypto.cpp
@@ -22,9 +22,9 @@
 
 #include <random>
 #include <secp256k1/secp256k1.h>
-#include <libethcore/Common.h>
-#include <libethcore/RLP.h>
-#include <libethcore/Log.h>
+#include <libethsupport/Common.h>
+#include <libethsupport/RLP.h>
+#include <libethsupport/Log.h>
 #include <libethereum/Transaction.h>
 #include <boost/test/unit_test.hpp>
 
diff --git a/dagger.cpp b/dagger.cpp
index d21c59e97..27ad1c741 100644
--- a/dagger.cpp
+++ b/dagger.cpp
@@ -21,8 +21,8 @@
  */
 
 #include <chrono>
-#include <libethcore/Log.h>
-#include <libethereum/Dagger.h>
+#include <libethsupport/Log.h>
+#include <libethcore/Dagger.h>
 using namespace std;
 using namespace std::chrono;
 using namespace eth;
diff --git a/hexPrefix.cpp b/hexPrefix.cpp
index 6d3ed89fc..565ef50c2 100644
--- a/hexPrefix.cpp
+++ b/hexPrefix.cpp
@@ -22,8 +22,8 @@
 
 #include <fstream>
 #include "JsonSpiritHeaders.h"
-#include <libethcore/TrieCommon.h>
-#include <libethcore/Log.h>
+#include <libethsupport/TrieCommon.h>
+#include <libethsupport/Log.h>
 #include <boost/test/unit_test.hpp>
 
 using namespace std;
diff --git a/main.cpp b/main.cpp
index 674bb1426..f30d5e89e 100644
--- a/main.cpp
+++ b/main.cpp
@@ -31,8 +31,8 @@ int vmTest();
 int hexPrefixTest();
 int peerTest(int argc, char** argv);
 
-#include <libethcore/Log.h>
-#include <libethereum/BlockInfo.h>
+#include <libethsupport/Log.h>
+#include <libethcore/BlockInfo.h>
 using namespace std;
 using namespace eth;
 
diff --git a/rlp.cpp b/rlp.cpp
index 56fcd137c..5adebeabd 100644
--- a/rlp.cpp
+++ b/rlp.cpp
@@ -23,9 +23,9 @@
 #include <fstream>
 #include <sstream>
 #include "JsonSpiritHeaders.h"
-#include <libethcore/Log.h>
-#include <libethcore/RLP.h>
-#include <libethcore/Common.h>
+#include <libethsupport/Log.h>
+#include <libethsupport/RLP.h>
+#include <libethsupport/Common.h>
 #include <boost/test/unit_test.hpp>
 #include <algorithm>
 
diff --git a/trie.cpp b/trie.cpp
index 55b6871ab..4a18a650e 100644
--- a/trie.cpp
+++ b/trie.cpp
@@ -23,7 +23,7 @@
 #include <fstream>
 #include <random>
 #include "JsonSpiritHeaders.h"
-#include <libethcore/TrieDB.h>
+#include <libethsupport/TrieDB.h>
 #include "TrieHash.h"
 #include "MemTrie.h"
 #include <boost/test/unit_test.hpp>
diff --git a/vm.cpp b/vm.cpp
index 890040984..6c3d5b1b1 100644
--- a/vm.cpp
+++ b/vm.cpp
@@ -22,11 +22,12 @@
 
 #include <fstream>
 #include <cstdint>
-#include <libethcore/Log.h>
-#include <libethereum/ExtVMFace.h>
+#include <libethsupport/Log.h>
+#include <libethcore/Instruction.h>
+#include <libevm/ExtVMFace.h>
+#include <libevm/VM.h>
+#include <liblll/Compiler.h>
 #include <libethereum/Transaction.h>
-#include <libethereum/VM.h>
-#include <libethereum/Instruction.h>
 #include "JsonSpiritHeaders.h"
 #include <boost/test/unit_test.hpp>