diff options
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/keystore.cpp | 1 | ||||
| -rw-r--r-- | src/wallet/crypter.cpp (renamed from src/crypter.cpp) | 0 | ||||
| -rw-r--r-- | src/wallet/crypter.h (renamed from src/crypter.h) | 0 | ||||
| -rw-r--r-- | src/wallet/wallet.h | 2 |
5 files changed, 3 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index d1a8efaa6a..2c607c632e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -88,7 +88,6 @@ BITCOIN_CORE_H = \ compat.h \ compressor.h \ core_io.h \ - crypter.h \ wallet/db.h \ eccryptoverify.h \ ecwrapper.h \ @@ -140,6 +139,7 @@ BITCOIN_CORE_H = \ utilstrencodings.h \ utiltime.h \ version.h \ + wallet/crypter.h \ wallet/walletdb.h \ wallet/wallet.h \ wallet/wallet_ismine.h \ @@ -198,8 +198,8 @@ libbitcoin_server_a_SOURCES = \ # when wallet enabled libbitcoin_wallet_a_CPPFLAGS = $(BITCOIN_INCLUDES) libbitcoin_wallet_a_SOURCES = \ + wallet/crypter.cpp \ wallet/db.cpp \ - crypter.cpp \ wallet/rpcdump.cpp \ wallet/rpcwallet.cpp \ wallet/wallet.cpp \ diff --git a/src/keystore.cpp b/src/keystore.cpp index 7531737e04..3bae24b7b9 100644 --- a/src/keystore.cpp +++ b/src/keystore.cpp @@ -5,7 +5,6 @@ #include "keystore.h" -#include "crypter.h" #include "key.h" #include "util.h" diff --git a/src/crypter.cpp b/src/wallet/crypter.cpp index c7f7e21679..c7f7e21679 100644 --- a/src/crypter.cpp +++ b/src/wallet/crypter.cpp diff --git a/src/crypter.h b/src/wallet/crypter.h index 32746b00df..32746b00df 100644 --- a/src/crypter.h +++ b/src/wallet/crypter.h diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 1a9feff9f3..fbcb56685e 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -9,11 +9,11 @@ #include "amount.h" #include "primitives/block.h" #include "primitives/transaction.h" -#include "crypter.h" #include "key.h" #include "keystore.h" #include "main.h" #include "ui_interface.h" +#include "wallet/crypter.h" #include "wallet/wallet_ismine.h" #include "wallet/walletdb.h" |