Split out libethcore from libethereum.

18 files changed, 45 insertions, 45 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 41f554c3..7fb86dbd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,8 +2,8 @@ cmake_policy(SET CMP0015 NEW)
 
 aux_source_directory(. SRC_LIST)
 
-include_directories(../secp256k1)
-include_directories(../libethereum)
+include_directories(..)
+link_directories(../libethcore)
 link_directories(../libethereum)
 
 add_executable(testeth ${SRC_LIST})
diff --git a/MemTrie.cpp b/MemTrie.cpp
index 0a7d0ebe..c9e4fd8f 100644
--- a/MemTrie.cpp
+++ b/MemTrie.cpp
@@ -21,8 +21,8 @@
 
 #include "MemTrie.h"
 
-#include <CommonEth.h>
-#include <TrieCommon.h>
+#include <libethcore/TrieCommon.h>
+#include <libethereum/CommonEth.h>
 using namespace std;
 using namespace eth;
 
diff --git a/MemTrie.h b/MemTrie.h
index 622ea531..5c6a7027 100644
--- a/MemTrie.h
+++ b/MemTrie.h
@@ -21,8 +21,8 @@
 
 #pragma once
 
-#include <Common.h>
-#include <FixedHash.h>
+#include <libethcore/Common.h>
+#include <libethcore/FixedHash.h>
 
 namespace eth
 {
diff --git a/TestHelper.cpp b/TestHelper.cpp
index 54cb84cc..06f188a8 100644
--- a/TestHelper.cpp
+++ b/TestHelper.cpp
@@ -21,7 +21,7 @@
 
 #include <thread>
 #include <chrono>
-#include <Client.h>
+#include <libethereum/Client.h>
 #include "TestHelper.h"
 
 namespace eth
diff --git a/TrieHash.cpp b/TrieHash.cpp
index 61840b0e..b12b96dd 100644
--- a/TrieHash.cpp
+++ b/TrieHash.cpp
@@ -21,8 +21,8 @@
 
 #include "TrieHash.h"
 
-#include <CommonEth.h>
-#include <TrieCommon.h>
+#include <libethcore/TrieCommon.h>
+#include <libethereum/CommonEth.h>
 using namespace std;
 using namespace eth;
 
diff --git a/TrieHash.h b/TrieHash.h
index e69b2b7b..f5e8564b 100644
--- a/TrieHash.h
+++ b/TrieHash.h
@@ -21,8 +21,8 @@
 
 #pragma once
 
-#include <Common.h>
-#include <FixedHash.h>
+#include <libethcore/Common.h>
+#include <libethcore/FixedHash.h>
 
 namespace eth
 {
diff --git a/crypto.cpp b/crypto.cpp
index 5dac1fce..720bc7ff 100644
--- a/crypto.cpp
+++ b/crypto.cpp
@@ -21,11 +21,11 @@
  */
 
 #include <random>
-#include <secp256k1.h>
-#include <Common.h>
-#include <RLP.h>
-#include <Log.h>
-#include <Transaction.h>
+#include <secp256k1/secp256k1.h>
+#include <libethcore/Common.h>
+#include <libethcore/RLP.h>
+#include <libethcore/Log.h>
+#include <libethereum/Transaction.h>
 #include <boost/test/unit_test.hpp>
 
 using namespace std;
diff --git a/dagger.cpp b/dagger.cpp
index 728c8382..d21c59e9 100644
--- a/dagger.cpp
+++ b/dagger.cpp
@@ -21,8 +21,8 @@
  */
 
 #include <chrono>
-#include "Log.h"
-#include "Dagger.h"
+#include <libethcore/Log.h>
+#include <libethereum/Dagger.h>
 using namespace std;
 using namespace std::chrono;
 using namespace eth;
diff --git a/fork.cpp b/fork.cpp
index 24e7be17..32b35d08 100644
--- a/fork.cpp
+++ b/fork.cpp
@@ -22,9 +22,9 @@
 
 #include <boost/test/unit_test.hpp>
 #include <boost/filesystem/operations.hpp>
-#include <Client.h>
-#include <BlockChain.h>
-#include <PeerServer.h>
+#include <libethereum/Client.h>
+#include <libethereum/BlockChain.h>
+#include <libethereum/PeerServer.h>
 #include "TestHelper.h"
 using namespace std;
 using namespace eth;
diff --git a/hexPrefix.cpp b/hexPrefix.cpp
index a3de61d2..6d3ed89f 100644
--- a/hexPrefix.cpp
+++ b/hexPrefix.cpp
@@ -22,8 +22,8 @@
 
 #include <fstream>
 #include "JsonSpiritHeaders.h"
-#include "TrieCommon.h"
-#include "Log.h"
+#include <libethcore/TrieCommon.h>
+#include <libethcore/Log.h>
 #include <boost/test/unit_test.hpp>
 
 using namespace std;
diff --git a/main.cpp b/main.cpp
index 97f32cce..7a2b8ab6 100644
--- a/main.cpp
+++ b/main.cpp
@@ -33,7 +33,7 @@ int vmTest();
 int hexPrefixTest();
 int peerTest(int argc, char** argv);
 
-#include <BlockInfo.h>
+#include <libethereum/BlockInfo.h>
 using namespace eth;
 
 BOOST_AUTO_TEST_CASE(basic_tests)
diff --git a/network.cpp b/network.cpp
index 3e27ac6b..216d518c 100644
--- a/network.cpp
+++ b/network.cpp
@@ -22,9 +22,9 @@
 
 #include <boost/test/unit_test.hpp>
 #include <boost/filesystem/operations.hpp>
-#include <Client.h>
-#include <BlockChain.h>
-#include <PeerServer.h>
+#include <libethereum/Client.h>
+#include <libethereum/BlockChain.h>
+#include <libethereum/PeerServer.h>
 #include "TestHelper.h"
 using namespace std;
 using namespace eth;
diff --git a/peer.cpp b/peer.cpp
index 7a1f3248..20f2d322 100644
--- a/peer.cpp
+++ b/peer.cpp
@@ -23,8 +23,8 @@
 #include <chrono>
 #include <thread>
 #include <boost/filesystem/operations.hpp>
-#include <BlockChain.h>
-#include <PeerServer.h>
+#include <libethereum/BlockChain.h>
+#include <libethereum/PeerServer.h>
 using namespace std;
 using namespace eth;
 using boost::asio::ip::tcp;
diff --git a/rlp.cpp b/rlp.cpp
index 1271d7ff..56fcd137 100644
--- a/rlp.cpp
+++ b/rlp.cpp
@@ -23,9 +23,9 @@
 #include <fstream>
 #include <sstream>
 #include "JsonSpiritHeaders.h"
-#include <Log.h>
-#include <RLP.h>
-#include <Common.h>
+#include <libethcore/Log.h>
+#include <libethcore/RLP.h>
+#include <libethcore/Common.h>
 #include <boost/test/unit_test.hpp>
 #include <algorithm>
 
diff --git a/state.cpp b/state.cpp
index 60d68b93..262bf676 100644
--- a/state.cpp
+++ b/state.cpp
@@ -21,10 +21,10 @@
  */
 
 #include <boost/filesystem/operations.hpp>
-#include <secp256k1.h>
-#include <BlockChain.h>
-#include <State.h>
-#include <Defaults.h>
+#include <secp256k1/secp256k1.h>
+#include <libethereum/BlockChain.h>
+#include <libethereum/State.h>
+#include <libethereum/Defaults.h>
 using namespace std;
 using namespace eth;
 
diff --git a/trie.cpp b/trie.cpp
index 785bcc72..55b6871a 100644
--- a/trie.cpp
+++ b/trie.cpp
@@ -23,7 +23,7 @@
 #include <fstream>
 #include <random>
 #include "JsonSpiritHeaders.h"
-#include <TrieDB.h>
+#include <libethcore/TrieDB.h>
 #include "TrieHash.h"
 #include "MemTrie.h"
 #include <boost/test/unit_test.hpp>
diff --git a/txTest.cpp b/txTest.cpp
index 02aa990d..58fd11de 100644
--- a/txTest.cpp
+++ b/txTest.cpp
@@ -22,9 +22,9 @@
 
 #include <boost/test/unit_test.hpp>
 #include <boost/filesystem/operations.hpp>
-#include <Client.h>
-#include <BlockChain.h>
-#include <PeerServer.h>
+#include <libethereum/Client.h>
+#include <libethereum/BlockChain.h>
+#include <libethereum/PeerServer.h>
 #include "TestHelper.h"
 using namespace std;
 using namespace eth;
diff --git a/vm.cpp b/vm.cpp
index a3242b57..7d8501d3 100644
--- a/vm.cpp
+++ b/vm.cpp
@@ -21,11 +21,11 @@
  */
 
 #include <fstream>
-#include <ExtVMFace.h>
-#include <Transaction.h>
-#include <VM.h>
-#include <Log.h>
-#include <Instruction.h>
+#include <libethcore/Log.h>
+#include <libethereum/ExtVMFace.h>
+#include <libethereum/Transaction.h>
+#include <libethereum/VM.h>
+#include <libethereum/Instruction.h>
 #include "JsonSpiritHeaders.h"
 #include <boost/test/unit_test.hpp>