diff --git a/src/Makefile.am b/src/Makefile.am index 1235798aa..445164227 100644 --- 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 diff --git a/src/claimtrie/CMakeLists.txt b/src/claimtrie/CMakeLists.txt index 5459371ee..278abaec6 100644 --- 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) diff --git a/src/sqlite/hdr/sqlite_modern_cpp.h b/src/claimtrie/sqlite/hdr/sqlite_modern_cpp.h similarity index 100% rename from src/sqlite/hdr/sqlite_modern_cpp.h rename to src/claimtrie/sqlite/hdr/sqlite_modern_cpp.h diff --git a/src/sqlite/hdr/sqlite_modern_cpp/errors.h b/src/claimtrie/sqlite/hdr/sqlite_modern_cpp/errors.h similarity index 100% rename from src/sqlite/hdr/sqlite_modern_cpp/errors.h rename to src/claimtrie/sqlite/hdr/sqlite_modern_cpp/errors.h diff --git a/src/sqlite/hdr/sqlite_modern_cpp/lists/error_codes.h b/src/claimtrie/sqlite/hdr/sqlite_modern_cpp/lists/error_codes.h similarity index 100% rename from src/sqlite/hdr/sqlite_modern_cpp/lists/error_codes.h rename to src/claimtrie/sqlite/hdr/sqlite_modern_cpp/lists/error_codes.h diff --git a/src/sqlite/hdr/sqlite_modern_cpp/log.h b/src/claimtrie/sqlite/hdr/sqlite_modern_cpp/log.h similarity index 100% rename from src/sqlite/hdr/sqlite_modern_cpp/log.h rename to src/claimtrie/sqlite/hdr/sqlite_modern_cpp/log.h diff --git a/src/sqlite/hdr/sqlite_modern_cpp/sqlcipher.h b/src/claimtrie/sqlite/hdr/sqlite_modern_cpp/sqlcipher.h similarity index 100% rename from src/sqlite/hdr/sqlite_modern_cpp/sqlcipher.h rename to src/claimtrie/sqlite/hdr/sqlite_modern_cpp/sqlcipher.h diff --git a/src/sqlite/hdr/sqlite_modern_cpp/type_wrapper.h b/src/claimtrie/sqlite/hdr/sqlite_modern_cpp/type_wrapper.h similarity index 100% rename from src/sqlite/hdr/sqlite_modern_cpp/type_wrapper.h rename to src/claimtrie/sqlite/hdr/sqlite_modern_cpp/type_wrapper.h diff --git a/src/sqlite/hdr/sqlite_modern_cpp/utility/function_traits.h b/src/claimtrie/sqlite/hdr/sqlite_modern_cpp/utility/function_traits.h similarity index 100% rename from src/sqlite/hdr/sqlite_modern_cpp/utility/function_traits.h rename to src/claimtrie/sqlite/hdr/sqlite_modern_cpp/utility/function_traits.h diff --git a/src/sqlite/hdr/sqlite_modern_cpp/utility/uncaught_exceptions.h b/src/claimtrie/sqlite/hdr/sqlite_modern_cpp/utility/uncaught_exceptions.h similarity index 100% rename from src/sqlite/hdr/sqlite_modern_cpp/utility/uncaught_exceptions.h rename to src/claimtrie/sqlite/hdr/sqlite_modern_cpp/utility/uncaught_exceptions.h diff --git a/src/sqlite/hdr/sqlite_modern_cpp/utility/utf16_utf8.h b/src/claimtrie/sqlite/hdr/sqlite_modern_cpp/utility/utf16_utf8.h similarity index 100% rename from src/sqlite/hdr/sqlite_modern_cpp/utility/utf16_utf8.h rename to src/claimtrie/sqlite/hdr/sqlite_modern_cpp/utility/utf16_utf8.h diff --git a/src/sqlite/shell.c b/src/claimtrie/sqlite/shell.c similarity index 100% rename from src/sqlite/shell.c rename to src/claimtrie/sqlite/shell.c diff --git a/src/sqlite/sqlite3.c b/src/claimtrie/sqlite/sqlite3.c similarity index 100% rename from src/sqlite/sqlite3.c rename to src/claimtrie/sqlite/sqlite3.c diff --git a/src/sqlite/sqlite3.h b/src/claimtrie/sqlite/sqlite3.h similarity index 100% rename from src/sqlite/sqlite3.h rename to src/claimtrie/sqlite/sqlite3.h diff --git a/src/sqlite/sqlite3ext.h b/src/claimtrie/sqlite/sqlite3ext.h similarity index 100% rename from src/sqlite/sqlite3ext.h rename to src/claimtrie/sqlite/sqlite3ext.h