Implement accurate memory accounting for mempool

[VerusCoin.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index e37510ae42a7a77cad92d49adc131fcd9f6020d3..8f638b473c0bd7a35b76a3399bd207d40d2504f3 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-DIST_SUBDIRS = secp256k1
+DIST_SUBDIRS = secp256k1 univalue

 AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS)
 
 
 AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS)
 
 


@@ -21,6 +21,7 @@ BITCOIN_CONFIG_INCLUDES=-I$(builddir)/config
 BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS) $(SSL_CFLAGS)
 
 BITCOIN_INCLUDES += -I$(srcdir)/secp256k1/include
 BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS) $(SSL_CFLAGS)
 
 BITCOIN_INCLUDES += -I$(srcdir)/secp256k1/include

+BITCOIN_INCLUDES += -I$(srcdir)/univalue/include

 
 LIBBITCOIN_SERVER=libbitcoin_server.a
 LIBBITCOIN_WALLET=libbitcoin_wallet.a
 
 LIBBITCOIN_SERVER=libbitcoin_server.a
 LIBBITCOIN_WALLET=libbitcoin_wallet.a


@@ -28,21 +29,22 @@ LIBBITCOIN_COMMON=libbitcoin_common.a
 LIBBITCOIN_CLI=libbitcoin_cli.a
 LIBBITCOIN_UTIL=libbitcoin_util.a
 LIBBITCOIN_CRYPTO=crypto/libbitcoin_crypto.a
 LIBBITCOIN_CLI=libbitcoin_cli.a
 LIBBITCOIN_UTIL=libbitcoin_util.a
 LIBBITCOIN_CRYPTO=crypto/libbitcoin_crypto.a

-LIBBITCOIN_UNIVALUE=univalue/libbitcoin_univalue.a
-LIBBITCOINQT=qt/libbitcoinqt.a

 LIBSECP256K1=secp256k1/libsecp256k1.la
 LIBSECP256K1=secp256k1/libsecp256k1.la

+LIBUNIVALUE=univalue/libunivalue.la

 LIBZCASH=libzcash.a
 
 $(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*)
        $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
 
 LIBZCASH=libzcash.a
 
 $(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*)
        $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)
 

+$(LIBUNIVALUE): $(wildcard univalue/lib/*)
+       $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C univalue/
+

 # Make is not made aware of per-object dependencies to avoid limiting building parallelization
 # But to build the less dependent modules first, we manually select their order here:
 EXTRA_LIBRARIES = \
   crypto/libbitcoin_crypto.a \
   libbitcoin_util.a \
   libbitcoin_common.a \
 # Make is not made aware of per-object dependencies to avoid limiting building parallelization
 # But to build the less dependent modules first, we manually select their order here:
 EXTRA_LIBRARIES = \
   crypto/libbitcoin_crypto.a \
   libbitcoin_util.a \
   libbitcoin_common.a \

-  univalue/libbitcoin_univalue.a \

   libbitcoin_server.a \
   libbitcoin_cli.a \
   libzcash.a
   libbitcoin_server.a \
   libbitcoin_cli.a \
   libzcash.a


@@ -50,6 +52,9 @@ if ENABLE_WALLET
 BITCOIN_INCLUDES += $(BDB_CPPFLAGS)
 EXTRA_LIBRARIES += libbitcoin_wallet.a
 endif
 BITCOIN_INCLUDES += $(BDB_CPPFLAGS)
 EXTRA_LIBRARIES += libbitcoin_wallet.a
 endif

+if ENABLE_ZMQ
+EXTRA_LIBRARIES += libbitcoin_zmq.a
+endif

 
 if BUILD_BITCOIN_LIBS
 lib_LTLIBRARIES = libzcashconsensus.la
 
 if BUILD_BITCOIN_LIBS
 lib_LTLIBRARIES = libzcashconsensus.la


@@ -59,6 +64,7 @@ LIBZCASH_CONSENSUS=
 endif
 
 bin_PROGRAMS =
 endif
 
 bin_PROGRAMS =

+noinst_PROGRAMS =

 TESTS =
 
 if BUILD_BITCOIND
 TESTS =
 
 if BUILD_BITCOIND


@@ -171,18 +177,12 @@ BITCOIN_CORE_H = \
   wallet/db.h \
   wallet/wallet.h \
   wallet/wallet_ismine.h \
   wallet/db.h \
   wallet/wallet.h \
   wallet/wallet_ismine.h \

-  wallet/walletdb.h
-
-JSON_H = \
-  json/json_spirit.h \
-  json/json_spirit_error_position.h \
-  json/json_spirit_reader.h \
-  json/json_spirit_reader_template.h \
-  json/json_spirit_stream_reader.h \
-  json/json_spirit_utils.h \
-  json/json_spirit_value.h \
-  json/json_spirit_writer.h \
-  json/json_spirit_writer_template.h
+  wallet/walletdb.h \
+  zmq/zmqabstractnotifier.h \
+  zmq/zmqconfig.h\
+  zmq/zmqnotificationinterface.h \
+  zmq/zmqpublishnotifier.h
+

 
 obj/build.h: FORCE
        @$(MKDIR_P) $(builddir)/obj
 
 obj/build.h: FORCE
        @$(MKDIR_P) $(builddir)/obj


@@ -190,7 +190,7 @@ obj/build.h: FORCE
          $(abs_top_srcdir)
 libbitcoin_util_a-clientversion.$(OBJEXT): obj/build.h
 
          $(abs_top_srcdir)
 libbitcoin_util_a-clientversion.$(OBJEXT): obj/build.h
 

-# server: shared between bitcoind and bitcoin-qt
+# server: zcashd

 libbitcoin_server_a_CPPFLAGS = $(BITCOIN_INCLUDES) $(MINIUPNPC_CPPFLAGS)
 libbitcoin_server_a_SOURCES = \
   sendalert.cpp \
 libbitcoin_server_a_CPPFLAGS = $(BITCOIN_INCLUDES) $(MINIUPNPC_CPPFLAGS)
 libbitcoin_server_a_SOURCES = \
   sendalert.cpp \


@@ -224,12 +224,21 @@ libbitcoin_server_a_SOURCES = \
   txdb.cpp \
   txmempool.cpp \
   validationinterface.cpp \
   txdb.cpp \
   txmempool.cpp \
   validationinterface.cpp \

-  $(JSON_H) \

   $(BITCOIN_CORE_H) \
   $(LIBZCASH_H)
 
   $(BITCOIN_CORE_H) \
   $(LIBZCASH_H)
 

-# wallet: shared between bitcoind and bitcoin-qt, but only linked
-# when wallet enabled
+if ENABLE_ZMQ
+LIBBITCOIN_ZMQ=libbitcoin_zmq.a
+
+libbitcoin_zmq_a_CPPFLAGS = $(BITCOIN_INCLUDES) $(ZMQ_CFLAGS)
+libbitcoin_zmq_a_SOURCES = \
+  zmq/zmqabstractnotifier.cpp \
+  zmq/zmqnotificationinterface.cpp \
+  zmq/zmqpublishnotifier.cpp
+endif
+
+
+# wallet: zcashd, but only linked when wallet enabled

 libbitcoin_wallet_a_CPPFLAGS = $(BITCOIN_INCLUDES)
 libbitcoin_wallet_a_SOURCES = \
   utiltest.cpp \
 libbitcoin_wallet_a_CPPFLAGS = $(BITCOIN_INCLUDES)
 libbitcoin_wallet_a_SOURCES = \
   utiltest.cpp \


@@ -247,13 +256,8 @@ libbitcoin_wallet_a_SOURCES = \
   $(BITCOIN_CORE_H) \
   $(LIBZCASH_H)
 
   $(BITCOIN_CORE_H) \
   $(LIBZCASH_H)
 

-EQUIHASH_TROMP_SOURCES = \
-  pow/tromp/equi_miner.h \
-  pow/tromp/equi.h \
-  pow/tromp/osx_barrier.h
-

 # crypto primitives library
 # crypto primitives library

-crypto_libbitcoin_crypto_a_CPPFLAGS = $(BITCOIN_CONFIG_INCLUDES) -DEQUIHASH_TROMP_ATOMIC
+crypto_libbitcoin_crypto_a_CPPFLAGS = $(BITCOIN_CONFIG_INCLUDES)

 crypto_libbitcoin_crypto_a_SOURCES = \
   crypto/common.h \
   crypto/equihash.cpp \
 crypto_libbitcoin_crypto_a_SOURCES = \
   crypto/common.h \
   crypto/equihash.cpp \


@@ -270,18 +274,21 @@ crypto_libbitcoin_crypto_a_SOURCES = \
   crypto/sha256.cpp \
   crypto/sha256.h \
   crypto/sha512.cpp \
   crypto/sha256.cpp \
   crypto/sha256.h \
   crypto/sha512.cpp \

-  crypto/sha512.h \
-  ${EQUIHASH_TROMP_SOURCES}
+  crypto/sha512.h

 
 

-# univalue JSON library
-univalue_libbitcoin_univalue_a_SOURCES = \
-  univalue/univalue.cpp \
-  univalue/univalue.h \
-  univalue/univalue_escapes.h \
-  univalue/univalue_read.cpp \
-  univalue/univalue_write.cpp
+if ENABLE_MINING
+EQUIHASH_TROMP_SOURCES = \
+  pow/tromp/equi_miner.h \
+  pow/tromp/equi.h \
+  pow/tromp/osx_barrier.h

 
 

-# common: shared between bitcoind, and bitcoin-qt and non-server tools
+crypto_libbitcoin_crypto_a_CPPFLAGS += \
+  -DEQUIHASH_TROMP_ATOMIC
+crypto_libbitcoin_crypto_a_SOURCES += \
+  ${EQUIHASH_TROMP_SOURCES}
+endif
+
+# common: shared between zcashd and non-server tools

 libbitcoin_common_a_CPPFLAGS = $(BITCOIN_INCLUDES)
 libbitcoin_common_a_SOURCES = \
   amount.cpp \
 libbitcoin_common_a_CPPFLAGS = $(BITCOIN_INCLUDES)
 libbitcoin_common_a_SOURCES = \
   amount.cpp \


@@ -338,7 +345,7 @@ if GLIBC_BACK_COMPAT
 libbitcoin_util_a_SOURCES += compat/glibc_compat.cpp
 endif
 
 libbitcoin_util_a_SOURCES += compat/glibc_compat.cpp
 endif
 

-# cli: shared between bitcoin-cli and bitcoin-qt
+# cli: zcash-cli

 libbitcoin_cli_a_CPPFLAGS = $(BITCOIN_INCLUDES)
 libbitcoin_cli_a_SOURCES = \
   rpcclient.cpp \
 libbitcoin_cli_a_CPPFLAGS = $(BITCOIN_INCLUDES)
 libbitcoin_cli_a_SOURCES = \
   rpcclient.cpp \


@@ -360,7 +367,7 @@ endif
 zcashd_LDADD = \
   $(LIBBITCOIN_SERVER) \
   $(LIBBITCOIN_COMMON) \
 zcashd_LDADD = \
   $(LIBBITCOIN_SERVER) \
   $(LIBBITCOIN_COMMON) \

-  $(LIBBITCOIN_UNIVALUE) \
+  $(LIBUNIVALUE) \

   $(LIBBITCOIN_UTIL) \
   $(LIBBITCOIN_CRYPTO) \
   $(LIBZCASH) \
   $(LIBBITCOIN_UTIL) \
   $(LIBBITCOIN_CRYPTO) \
   $(LIBZCASH) \


@@ -368,6 +375,10 @@ zcashd_LDADD = \
   $(LIBMEMENV) \
   $(LIBSECP256K1)
 
   $(LIBMEMENV) \
   $(LIBSECP256K1)
 

+if ENABLE_ZMQ
+zcashd_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
+endif
+

 if ENABLE_WALLET
 zcashd_LDADD += libbitcoin_wallet.a
 endif
 if ENABLE_WALLET
 zcashd_LDADD += libbitcoin_wallet.a
 endif


@@ -381,7 +392,6 @@ zcashd_LDADD += \
   $(LIBZCASH) \
   $(LIBBITCOIN_CRYPTO) \
   $(LIBZCASH_LIBS)
   $(LIBZCASH) \
   $(LIBBITCOIN_CRYPTO) \
   $(LIBZCASH_LIBS)

-#

 
 # bitcoin-cli binary #
 zcash_cli_SOURCES = bitcoin-cli.cpp
 
 # bitcoin-cli binary #
 zcash_cli_SOURCES = bitcoin-cli.cpp


@@ -394,6 +404,7 @@ endif
 
 zcash_cli_LDADD = \
   $(LIBBITCOIN_CLI) \
 
 zcash_cli_LDADD = \
   $(LIBBITCOIN_CLI) \

+  $(LIBUNIVALUE) \

   $(LIBBITCOIN_UTIL) \
   $(BOOST_LIBS) \
   $(SSL_LIBS) \
   $(LIBBITCOIN_UTIL) \
   $(BOOST_LIBS) \
   $(SSL_LIBS) \


@@ -414,7 +425,7 @@ endif
 
 # FIXME: Is libzcash needed for zcash_tx?
 zcash_tx_LDADD = \
 
 # FIXME: Is libzcash needed for zcash_tx?
 zcash_tx_LDADD = \

-  $(LIBBITCOIN_UNIVALUE) \
+  $(LIBUNIVALUE) \

   $(LIBBITCOIN_COMMON) \
   $(LIBBITCOIN_UTIL) \
   $(LIBSECP256K1) \
   $(LIBBITCOIN_COMMON) \
   $(LIBBITCOIN_UTIL) \
   $(LIBSECP256K1) \


@@ -482,7 +493,7 @@ libzcashconsensus_la_CPPFLAGS = $(CRYPTO_CFLAGS) -I$(builddir)/obj -DBUILD_BITCO
 endif
 #
 
 endif
 #
 

-CLEANFILES = leveldb/libleveldb.a leveldb/libmemenv.a *.gcda *.gcno
+CLEANFILES = leveldb/libleveldb.a leveldb/libmemenv.a *.gcda *.gcno */*.gcno wallet/*/*.gcno

 
 DISTCLEANFILES = obj/build.h
 
 
 DISTCLEANFILES = obj/build.h
 


@@ -500,7 +511,7 @@ clean-local:
 
 .mm.o:
        $(AM_V_CXX) $(OBJCXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 
 .mm.o:
        $(AM_V_CXX) $(OBJCXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \

-         $(CPPFLAGS) $(AM_CXXFLAGS) $(QT_INCLUDES) $(CXXFLAGS)  -c -o $@ $<
+         $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)  -c -o $@ $<

 
 check-symbols: $(bin_PROGRAMS)
 if GLIBC_BACK_COMPAT
 
 check-symbols: $(bin_PROGRAMS)
 if GLIBC_BACK_COMPAT


@@ -523,12 +534,4 @@ include Makefile.test.include
 include Makefile.gtest.include
 endif
 
 include Makefile.gtest.include
 endif
 

-if ENABLE_QT
-include Makefile.qt.include
-endif
-
-if ENABLE_QT_TESTS
-include Makefile.qttest.include
-endif
-

 include Makefile.zcash.include
 include Makefile.zcash.include