1 files changed, 37 insertions, 8 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 9d3365fd60..5ce1c8e1b6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,6 +4,9 @@ AM_CPPFLAGS += -I$(top_srcdir)/src/leveldb/helpers/memenv \
   -I$(builddir)
 
 noinst_LIBRARIES = libbitcoin_server.a libbitcoin_common.a libbitcoin_cli.a
+if ENABLE_WALLET
+noinst_LIBRARIES += libbitcoin_wallet.a
+endif
 
 bin_PROGRAMS = bitcoind bitcoin-cli
 
@@ -33,14 +36,38 @@ obj/build.h: FORCE
 	  $(abs_top_srcdir)
 version.o: obj/build.h
 
-libbitcoin_server_a_SOURCES = addrman.cpp alert.cpp \
+libbitcoin_server_a_SOURCES = \
+  addrman.cpp \
+  alert.cpp \
   rpcserver.cpp \
   bloom.cpp \
-  chainparams.cpp checkpoints.cpp coins.cpp crypter.cpp db.cpp \
-  init.cpp keystore.cpp leveldbwrapper.cpp main.cpp miner.cpp \
-  net.cpp noui.cpp rpcblockchain.cpp rpcdump.cpp \
-  rpcmining.cpp rpcnet.cpp rpcrawtransaction.cpp rpcwallet.cpp \
-  txdb.cpp txmempool.cpp wallet.cpp walletdb.cpp $(JSON_H) \
+  chainparams.cpp \
+  checkpoints.cpp \
+  coins.cpp \
+  init.cpp \
+  keystore.cpp \
+  leveldbwrapper.cpp \
+  main.cpp \
+  miner.cpp \
+  net.cpp \
+  noui.cpp \
+  rpcblockchain.cpp \
+  rpcmining.cpp \
+  rpcmisc.cpp \
+  rpcnet.cpp \
+  rpcrawtransaction.cpp \
+  txdb.cpp \
+  txmempool.cpp \
+  $(JSON_H) \
+  $(BITCOIN_CORE_H)
+
+libbitcoin_wallet_a_SOURCES = \
+  db.cpp \
+  crypter.cpp \
+  rpcdump.cpp \
+  rpcwallet.cpp \
+  wallet.cpp \
+  walletdb.cpp \
   $(BITCOIN_CORE_H)
 
 libbitcoin_common_a_SOURCES = \
@@ -68,6 +95,9 @@ nodist_libbitcoin_common_a_SOURCES = $(top_srcdir)/src/obj/build.h
 # bitcoind binary #
 bitcoind_LDADD = libbitcoin_server.a libbitcoin_cli.a libbitcoin_common.a leveldb/libleveldb.a leveldb/libmemenv.a \
   $(BOOST_LIBS)
+if ENABLE_WALLET
+bitcoind_LDADD += libbitcoin_wallet.a
+endif
 bitcoind_SOURCES = bitcoind.cpp
 #
 
@@ -106,5 +136,4 @@ EXTRA_DIST = leveldb Makefile.include
 
 clean-local:
 	-$(MAKE) -C leveldb clean
-	rm -f leveldb/port/*.gcno leveldb/db/*.gcno leveldb/table/*.gcno leveldb/helpers/*.gcno
-	rm -f leveldb/util/*.gcno leveldb/helpers/memenv/*.gcno
+	rm -f leveldb/*/*.gcno leveldb/helpers/memenv/*.gcno