aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile.am
diff options
context:
space:
mode:
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am34
1 files changed, 22 insertions, 12 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 49249fedc7..24a95eed84 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,12 +1,11 @@
include Makefile.include
-AM_CPPFLAGS = $(INCLUDES) -I$(top_builddir)/src/obj \
- -I$(top_srcdir)/src/leveldb/include -I$(top_srcdir)/src/leveldb/helpers \
- -I$(builddir) $(BOOST_INCLUDES) $(BDB_CPPFLAGS)
-AM_LDFLAGS = $(PTHREAD_CFLAGS)
+
+AM_CPPFLAGS += -I$(top_srcdir)/src/leveldb/helpers/memenv \
+ -I$(builddir)
noinst_LIBRARIES = libbitcoin.a
-bin_PROGRAMS = bitcoind
+bin_PROGRAMS = bitcoind bitcoin-cli
SUBDIRS = . $(BUILD_QT) $(BUILD_TEST)
DIST_SUBDIRS = . qt test
@@ -14,10 +13,10 @@ DIST_SUBDIRS = . qt test
# bitcoin core #
BITCOIN_CORE_H = addrman.h alert.h allocators.h base58.h bignum.h \
bitcoinrpc.h bloom.h chainparams.h checkpoints.h checkqueue.h \
- clientversion.h compat.h core.h crypter.h db.h hash.h init.h \
- key.h keystore.h leveldb.h limitedmap.h main.h miner.h mruset.h \
- netbase.h net.h protocol.h script.h serialize.h sync.h threadsafety.h \
- txdb.h ui_interface.h uint256.h util.h version.h walletdb.h wallet.h
+ clientversion.h compat.h core.h coins.h crypter.h db.h hash.h init.h \
+ key.h keystore.h leveldbwrapper.h limitedmap.h main.h miner.h mruset.h \
+ netbase.h net.h noui.h protocol.h script.h serialize.h sync.h threadsafety.h \
+ txdb.h txmempool.h ui_interface.h uint256.h util.h version.h walletdb.h wallet.h
JSON_H = json/json_spirit.h json/json_spirit_error_position.h \
json/json_spirit_reader.h json/json_spirit_reader_template.h \
@@ -32,11 +31,11 @@ obj/build.h: FORCE
version.o: obj/build.h
libbitcoin_a_SOURCES = addrman.cpp alert.cpp allocators.cpp bitcoinrpc.cpp bloom.cpp \
- chainparams.cpp checkpoints.cpp core.cpp crypter.cpp db.cpp hash.cpp \
- init.cpp key.cpp keystore.cpp leveldb.cpp main.cpp miner.cpp \
+ chainparams.cpp checkpoints.cpp core.cpp coins.cpp crypter.cpp db.cpp hash.cpp \
+ init.cpp key.cpp keystore.cpp leveldbwrapper.cpp main.cpp miner.cpp \
netbase.cpp net.cpp noui.cpp protocol.cpp rpcblockchain.cpp rpcdump.cpp \
rpcmining.cpp rpcnet.cpp rpcrawtransaction.cpp rpcwallet.cpp script.cpp \
- sync.cpp txdb.cpp util.cpp version.cpp wallet.cpp walletdb.cpp $(JSON_H) \
+ sync.cpp txdb.cpp txmempool.cpp util.cpp version.cpp wallet.cpp walletdb.cpp $(JSON_H) \
$(BITCOIN_CORE_H)
nodist_libbitcoin_a_SOURCES = $(top_srcdir)/src/obj/build.h
@@ -55,6 +54,17 @@ endif
AM_CPPFLAGS += $(BDB_CPPFLAGS)
bitcoind_LDADD += $(BDB_LIBS)
+# bitcoin-cli binary #
+bitcoin_cli_LDADD = libbitcoin.a leveldb/libleveldb.a leveldb/libmemenv.a \
+ $(BOOST_LIBS)
+bitcoin_cli_SOURCES = bitcoin-cli.cpp
+#
+
+if TARGET_WINDOWS
+bitcoin_cli_SOURCES += bitcoin-cli-res.rc
+endif
+bitcoin_cli_LDADD += $(BDB_LIBS)
+
leveldb/libleveldb.a: leveldb/libmemenv.a
leveldb/%.a: