Move sqlite back in claimtrie

Signed-off-by: Anthony Fieroni <bvbfan@abv.bg>
2019-12-12 18:58:23 +02:00 · 2019-12-12 18:58:23 +02:00 · e9854c6cf8
commit e9854c6cf8
parent 558aa49b5c
15 changed files with 2 additions and 2 deletions
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -411,11 +411,11 @@ claimtrie_libclaimtrie_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
 claimtrie_libclaimtrie_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 claimtrie_libclaimtrie_a_CFLAGS = $(PIE_FLAGS)
 claimtrie_libclaimtrie_a_SOURCES = \
-  sqlite/sqlite3.c \
  claimtrie/data.cpp \
  claimtrie/forks.cpp \
  claimtrie/hashes.cpp \
  claimtrie/log.cpp \
+  claimtrie/sqlite/sqlite3.c \
  claimtrie/trie.cpp \
  claimtrie/txoutpoint.cpp \
  claimtrie/uints.cpp
--- a/src/claimtrie/CMakeLists.txt
+++ b/src/claimtrie/CMakeLists.txt
@ -15,7 +15,7 @@ set(CLAIMTRIE_SRC
    trie.cpp
    txoutpoint.cpp
    uints.cpp
-    ../sqlite/sqlite3.c
+    ./sqlite/sqlite3.c
 )

 if(BIND)
--- a/src/claimtrie/sqlite/hdr/sqlite_modern_cpp.h
+++ b/src/claimtrie/sqlite/hdr/sqlite_modern_cpp.h
--- a/src/claimtrie/sqlite/hdr/sqlite_modern_cpp/errors.h
+++ b/src/claimtrie/sqlite/hdr/sqlite_modern_cpp/errors.h
--- a/src/claimtrie/sqlite/hdr/sqlite_modern_cpp/lists/error_codes.h
+++ b/src/claimtrie/sqlite/hdr/sqlite_modern_cpp/lists/error_codes.h
--- a/src/claimtrie/sqlite/hdr/sqlite_modern_cpp/log.h
+++ b/src/claimtrie/sqlite/hdr/sqlite_modern_cpp/log.h
--- a/src/claimtrie/sqlite/hdr/sqlite_modern_cpp/sqlcipher.h
+++ b/src/claimtrie/sqlite/hdr/sqlite_modern_cpp/sqlcipher.h
--- a/src/claimtrie/sqlite/hdr/sqlite_modern_cpp/type_wrapper.h
+++ b/src/claimtrie/sqlite/hdr/sqlite_modern_cpp/type_wrapper.h
--- a/src/claimtrie/sqlite/hdr/sqlite_modern_cpp/utility/function_traits.h
+++ b/src/claimtrie/sqlite/hdr/sqlite_modern_cpp/utility/function_traits.h
--- a/src/claimtrie/sqlite/hdr/sqlite_modern_cpp/utility/uncaught_exceptions.h
+++ b/src/claimtrie/sqlite/hdr/sqlite_modern_cpp/utility/uncaught_exceptions.h
--- a/src/claimtrie/sqlite/hdr/sqlite_modern_cpp/utility/utf16_utf8.h
+++ b/src/claimtrie/sqlite/hdr/sqlite_modern_cpp/utility/utf16_utf8.h
--- a/src/claimtrie/sqlite/shell.c
+++ b/src/claimtrie/sqlite/shell.c
--- a/src/claimtrie/sqlite/sqlite3.c
+++ b/src/claimtrie/sqlite/sqlite3.c
--- a/src/claimtrie/sqlite/sqlite3.h
+++ b/src/claimtrie/sqlite/sqlite3.h
--- a/src/claimtrie/sqlite/sqlite3ext.h
+++ b/src/claimtrie/sqlite/sqlite3ext.h