aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/Makefile.am79
-rw-r--r--src/qt/Makefile.am179
-rw-r--r--src/qt/test/Makefile.am13
-rw-r--r--src/test/Makefile.am53
4 files changed, 250 insertions, 74 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 85d7c3c9c6..9917be2481 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,10 @@ include Makefile.include
AM_CPPFLAGS += -I$(top_srcdir)/src/leveldb/helpers/memenv \
-I$(builddir)
-noinst_LIBRARIES = libbitcoin_server.a libbitcoin_common.a libbitcoin_cli.a
+noinst_LIBRARIES = \
+ libbitcoin_server.a \
+ libbitcoin_common.a \
+ libbitcoin_cli.a
if ENABLE_WALLET
noinst_LIBRARIES += libbitcoin_wallet.a
endif
@@ -14,20 +17,60 @@ SUBDIRS = . $(BUILD_QT) $(BUILD_TEST)
DIST_SUBDIRS = . qt test
.PHONY: FORCE
# bitcoin core #
-BITCOIN_CORE_H = addrman.h alert.h allocators.h base58.h bignum.h \
+BITCOIN_CORE_H = \
+ addrman.h \
+ alert.h \
+ allocators.h \
+ base58.h bignum.h \
+ bloom.h \
+ chainparams.h \
+ checkpoints.h \
+ checkqueue.h \
+ clientversion.h \
+ coincontrol.h \
+ coins.h \
+ compat.h \
+ core.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 \
rpcclient.h \
rpcprotocol.h \
rpcserver.h \
- bloom.h chainparams.h checkpoints.h checkqueue.h \
- clientversion.h coincontrol.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 \
- json/json_spirit_stream_reader.h json/json_spirit_utils.h \
- json/json_spirit_value.h json/json_spirit_writer.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 \
+ 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
obj/build.h: FORCE
@@ -93,7 +136,12 @@ 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
+bitcoind_LDADD = \
+ libbitcoin_server.a \
+ libbitcoin_cli.a \
+ libbitcoin_common.a \
+ leveldb/libleveldb.a \
+ leveldb/libmemenv.a
if ENABLE_WALLET
bitcoind_LDADD += libbitcoin_wallet.a
endif
@@ -108,7 +156,10 @@ AM_CPPFLAGS += $(BDB_CPPFLAGS)
bitcoind_LDADD += $(BOOST_LIBS) $(BDB_LIBS)
# bitcoin-cli binary #
-bitcoin_cli_LDADD = libbitcoin_cli.a libbitcoin_common.a $(BOOST_LIBS)
+bitcoin_cli_LDADD = \
+ libbitcoin_cli.a \
+ libbitcoin_common.a \
+ $(BOOST_LIBS)
bitcoin_cli_SOURCES = bitcoin-cli.cpp
#
diff --git a/src/qt/Makefile.am b/src/qt/Makefile.am
index 53bd893fad..ac11625c86 100644
--- a/src/qt/Makefile.am
+++ b/src/qt/Makefile.am
@@ -74,37 +74,68 @@ QT_TS = \
locale/bitcoin_zh_CN.ts \
locale/bitcoin_zh_TW.ts
-QT_FORMS_UI = forms/aboutdialog.ui forms/addressbookpage.ui \
+QT_FORMS_UI = \
+ forms/aboutdialog.ui \
+ forms/addressbookpage.ui \
forms/askpassphrasedialog.ui \
forms/coincontroldialog.ui \
forms/editaddressdialog.ui \
forms/intro.ui \
forms/openuridialog.ui \
- forms/optionsdialog.ui forms/overviewpage.ui forms/receiverequestdialog.ui \
+ forms/optionsdialog.ui \
+ forms/overviewpage.ui \
+ forms/receiverequestdialog.ui \
forms/receivecoinsdialog.ui \
- forms/rpcconsole.ui forms/sendcoinsdialog.ui forms/sendcoinsentry.ui \
- forms/signverifymessagedialog.ui forms/transactiondescdialog.ui
+ forms/rpcconsole.ui \
+ forms/sendcoinsdialog.ui \
+ forms/sendcoinsentry.ui \
+ forms/signverifymessagedialog.ui \
+ forms/transactiondescdialog.ui
-QT_MOC_CPP = moc_aboutdialog.cpp moc_addressbookpage.cpp \
- moc_addresstablemodel.cpp moc_askpassphrasedialog.cpp \
- moc_bitcoinaddressvalidator.cpp moc_bitcoinamountfield.cpp \
- moc_bitcoingui.cpp moc_bitcoinunits.cpp moc_clientmodel.cpp \
+QT_MOC_CPP = \
+ moc_aboutdialog.cpp \
+ moc_addressbookpage.cpp \
+ moc_addresstablemodel.cpp \
+ moc_askpassphrasedialog.cpp \
+ moc_bitcoinaddressvalidator.cpp \
+ moc_bitcoinamountfield.cpp \
+ moc_bitcoingui.cpp \
+ moc_bitcoinunits.cpp \
+ moc_clientmodel.cpp \
moc_coincontroldialog.cpp \
moc_coincontroltreewidget.cpp \
- moc_csvmodelwriter.cpp moc_editaddressdialog.cpp moc_guiutil.cpp \
- moc_intro.cpp moc_macdockiconhandler.cpp moc_macnotificationhandler.cpp \
- moc_monitoreddatamapper.cpp moc_notificator.cpp \
+ moc_csvmodelwriter.cpp \
+ moc_editaddressdialog.cpp \
+ moc_guiutil.cpp \
+ moc_intro.cpp \
+ moc_macdockiconhandler.cpp \
+ moc_macnotificationhandler.cpp \
+ moc_monitoreddatamapper.cpp \
+ moc_notificator.cpp \
moc_openuridialog.cpp \
moc_optionsdialog.cpp \
- moc_optionsmodel.cpp moc_overviewpage.cpp moc_paymentserver.cpp \
- moc_receiverequestdialog.cpp moc_qvalidatedlineedit.cpp moc_qvaluecombobox.cpp \
+ moc_optionsmodel.cpp \
+ moc_overviewpage.cpp \
+ moc_paymentserver.cpp \
+ moc_receiverequestdialog.cpp \
+ moc_qvalidatedlineedit.cpp \
+ moc_qvaluecombobox.cpp \
moc_receivecoinsdialog.cpp \
moc_recentrequeststablemodel.cpp \
- moc_rpcconsole.cpp moc_sendcoinsdialog.cpp moc_sendcoinsentry.cpp \
- moc_signverifymessagedialog.cpp moc_splashscreen.cpp moc_trafficgraphwidget.cpp moc_transactiondesc.cpp \
- moc_transactiondescdialog.cpp moc_transactionfilterproxy.cpp \
- moc_transactiontablemodel.cpp moc_transactionview.cpp moc_walletframe.cpp \
- moc_walletmodel.cpp moc_walletview.cpp
+ moc_rpcconsole.cpp \
+ moc_sendcoinsdialog.cpp \
+ moc_sendcoinsentry.cpp \
+ moc_signverifymessagedialog.cpp \
+ moc_splashscreen.cpp \
+ moc_trafficgraphwidget.cpp \
+ moc_transactiondesc.cpp \
+ moc_transactiondescdialog.cpp \
+ moc_transactionfilterproxy.cpp \
+ moc_transactiontablemodel.cpp \
+ moc_transactionview.cpp \
+ moc_walletframe.cpp \
+ moc_walletmodel.cpp \
+ moc_walletview.cpp
BITCOIN_MM = macdockiconhandler.mm macnotificationhandler.mm
@@ -117,37 +148,97 @@ PROTOBUF_CC = paymentrequest.pb.cc
PROTOBUF_H = paymentrequest.pb.h
PROTOBUF_PROTO = paymentrequest.proto
-BITCOIN_QT_H = aboutdialog.h addressbookpage.h addresstablemodel.h \
- askpassphrasedialog.h bitcoinaddressvalidator.h bitcoinamountfield.h \
- bitcoingui.h bitcoinunits.h clientmodel.h coincontroldialog.h coincontroltreewidget.h csvmodelwriter.h \
- editaddressdialog.h guiconstants.h guiutil.h intro.h macdockiconhandler.h \
- macnotificationhandler.h monitoreddatamapper.h notificator.h \
+BITCOIN_QT_H = \
+ aboutdialog.h \
+ addressbookpage.h \
+ addresstablemodel.h \
+ askpassphrasedialog.h \
+ bitcoinaddressvalidator.h \
+ bitcoinamountfield.h \
+ bitcoingui.h \
+ bitcoinunits.h \
+ clientmodel.h \
+ coincontroldialog.h \
+ coincontroltreewidget.h \
+ csvmodelwriter.h \
+ editaddressdialog.h \
+ guiconstants.h \
+ guiutil.h \
+ intro.h \
+ macdockiconhandler.h \
+ macnotificationhandler.h \
+ monitoreddatamapper.h \
+ notificator.h \
openuridialog.h \
optionsdialog.h \
- optionsmodel.h overviewpage.h paymentrequestplus.h paymentserver.h \
+ optionsmodel.h \
+ overviewpage.h \
+ paymentrequestplus.h \
+ paymentserver.h \
receivecoinsdialog.h \
recentrequeststablemodel.h \
- receiverequestdialog.h qvalidatedlineedit.h qvaluecombobox.h rpcconsole.h \
- sendcoinsdialog.h sendcoinsentry.h signverifymessagedialog.h splashscreen.h \
- trafficgraphwidget.h transactiondescdialog.h transactiondesc.h transactionfilterproxy.h \
- transactionrecord.h transactiontablemodel.h transactionview.h walletframe.h \
- walletmodel.h walletmodeltransaction.h walletview.h
+ receiverequestdialog.h \
+ qvalidatedlineedit.h \
+ qvaluecombobox.h \
+ rpcconsole.h \
+ sendcoinsdialog.h \
+ sendcoinsentry.h \
+ signverifymessagedialog.h \
+ splashscreen.h \
+ trafficgraphwidget.h \
+ transactiondescdialog.h \
+ transactiondesc.h \
+ transactionfilterproxy.h \
+ transactionrecord.h \
+ transactiontablemodel.h \
+ transactionview.h \
+ walletframe.h \
+ walletmodel.h \
+ walletmodeltransaction.h \
+ walletview.h
-RES_ICONS = res/icons/bitcoin.png res/icons/address-book.png \
- res/icons/quit.png res/icons/send.png res/icons/toolbar.png \
- res/icons/connect0_16.png res/icons/connect1_16.png \
- res/icons/connect2_16.png res/icons/connect3_16.png \
- res/icons/connect4_16.png res/icons/transaction0.png \
- res/icons/transaction2.png res/icons/clock1.png res/icons/clock2.png \
- res/icons/clock3.png res/icons/clock4.png res/icons/clock5.png \
- res/icons/configure.png res/icons/receive.png res/icons/editpaste.png \
- res/icons/editcopy.png res/icons/add.png res/icons/bitcoin_testnet.png \
- res/icons/toolbar_testnet.png res/icons/edit.png res/icons/history.png \
- res/icons/overview.png res/icons/export.png res/icons/synced.png \
- res/icons/remove.png res/icons/tx_mined.png res/icons/tx_input.png \
- res/icons/tx_output.png res/icons/tx_inout.png res/icons/lock_closed.png \
- res/icons/lock_open.png res/icons/key.png res/icons/filesave.png \
- res/icons/qrcode.png res/icons/debugwindow.png res/icons/bitcoin.ico \
+RES_ICONS = \
+ res/icons/bitcoin.png \
+ res/icons/address-book.png \
+ res/icons/quit.png \
+ res/icons/send.png \
+ res/icons/toolbar.png \
+ res/icons/connect0_16.png \
+ res/icons/connect1_16.png \
+ res/icons/connect2_16.png \
+ res/icons/connect3_16.png \
+ res/icons/connect4_16.png \
+ res/icons/transaction0.png \
+ res/icons/transaction2.png \
+ res/icons/clock1.png \
+ res/icons/clock2.png \
+ res/icons/clock3.png \
+ res/icons/clock4.png \
+ res/icons/clock5.png \
+ res/icons/configure.png \
+ res/icons/receive.png \
+ res/icons/editpaste.png \
+ res/icons/editcopy.png \
+ res/icons/add.png \
+ res/icons/bitcoin_testnet.png \
+ res/icons/toolbar_testnet.png \
+ res/icons/edit.png \
+ res/icons/history.png \
+ res/icons/overview.png \
+ res/icons/export.png \
+ res/icons/synced.png \
+ res/icons/remove.png \
+ res/icons/tx_mined.png \
+ res/icons/tx_input.png \
+ res/icons/tx_output.png \
+ res/icons/tx_inout.png \
+ res/icons/lock_closed.png \
+ res/icons/lock_open.png \
+ res/icons/key.png \
+ res/icons/filesave.png \
+ res/icons/qrcode.png \
+ res/icons/debugwindow.png \
+ res/icons/bitcoin.ico \
res/icons/bitcoin_testnet.ico
BITCOIN_QT_CPP = \
diff --git a/src/qt/test/Makefile.am b/src/qt/test/Makefile.am
index da54ef376b..9c3f0417ac 100644
--- a/src/qt/test/Makefile.am
+++ b/src/qt/test/Makefile.am
@@ -14,14 +14,21 @@ if ENABLE_WALLET
TEST_QT_MOC_CPP += moc_paymentservertests.cpp
endif
-TEST_QT_H = uritests.h paymentservertests.h paymentrequestdata.h
+TEST_QT_H = \
+ uritests.h \
+ paymentservertests.h \
+ paymentrequestdata.h
BUILT_SOURCES = $(TEST_QT_MOC_CPP)
test_bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) $(QT_TEST_INCLUDES)
-test_bitcoin_qt_SOURCES = test_main.cpp uritests.cpp $(TEST_QT_H)
+test_bitcoin_qt_SOURCES = \
+ test_main.cpp \
+ uritests.cpp \
+ $(TEST_QT_H)
if ENABLE_WALLET
-test_bitcoin_qt_SOURCES += paymentservertests.cpp
+test_bitcoin_qt_SOURCES += \
+ paymentservertests.cpp
endif
nodist_test_bitcoin_qt_SOURCES = $(TEST_QT_MOC_CPP)
test_bitcoin_qt_LDADD = $(LIBBITCOINQT) $(LIBBITCOIN_SERVER)
diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index 384616e897..ff1d22cc24 100644
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -6,12 +6,15 @@ bin_PROGRAMS = test_bitcoin
TESTS = test_bitcoin
-JSON_TEST_FILES= data/script_valid.json \
- data/base58_keys_valid.json data/sig_canonical.json \
+JSON_TEST_FILES = \
+ data/script_valid.json \
+ data/base58_keys_valid.json \
+ data/sig_canonical.json \
data/sig_noncanonical.json \
data/base58_encode_decode.json \
data/base58_keys_invalid.json \
- data/script_invalid.json data/tx_invalid.json \
+ data/script_invalid.json \
+ data/tx_invalid.json \
data/tx_valid.json
RAW_TEST_FILES = data/alertTests.raw
@@ -27,18 +30,42 @@ test_bitcoin_LDADD += $(LIBBITCOIN_WALLET)
endif
test_bitcoin_LDADD += $(BDB_LIBS)
-test_bitcoin_SOURCES = alert_tests.cpp \
- allocator_tests.cpp base32_tests.cpp base58_tests.cpp base64_tests.cpp \
- bignum_tests.cpp bloom_tests.cpp canonical_tests.cpp checkblock_tests.cpp \
- Checkpoints_tests.cpp compress_tests.cpp DoS_tests.cpp getarg_tests.cpp \
- key_tests.cpp miner_tests.cpp mruset_tests.cpp multisig_tests.cpp \
- netbase_tests.cpp pmt_tests.cpp rpc_tests.cpp script_P2SH_tests.cpp \
- script_tests.cpp serialize_tests.cpp sigopcount_tests.cpp test_bitcoin.cpp \
- transaction_tests.cpp uint256_tests.cpp util_tests.cpp \
- sighash_tests.cpp $(JSON_TEST_FILES) $(RAW_TEST_FILES)
+test_bitcoin_SOURCES = \
+ alert_tests.cpp \
+ allocator_tests.cpp \
+ base32_tests.cpp \
+ base58_tests.cpp \
+ base64_tests.cpp \
+ bignum_tests.cpp \
+ bloom_tests.cpp canonical_tests.cpp \
+ checkblock_tests.cpp \
+ Checkpoints_tests.cpp \
+ compress_tests.cpp \
+ DoS_tests.cpp \
+ getarg_tests.cpp \
+ key_tests.cpp \
+ miner_tests.cpp \
+ mruset_tests.cpp \
+ multisig_tests.cpp \
+ netbase_tests.cpp \
+ pmt_tests.cpp \
+ rpc_tests.cpp \
+ script_P2SH_tests.cpp \
+ script_tests.cpp \
+ serialize_tests.cpp \
+ sigopcount_tests.cpp \
+ test_bitcoin.cpp \
+ transaction_tests.cpp \
+ uint256_tests.cpp \
+ util_tests.cpp \
+ sighash_tests.cpp \
+ $(JSON_TEST_FILES) $(RAW_TEST_FILES)
if ENABLE_WALLET
-test_bitcoin_SOURCES += accounting_tests.cpp wallet_tests.cpp rpc_wallet_tests.cpp
+test_bitcoin_SOURCES += \
+ accounting_tests.cpp \
+ wallet_tests.cpp \
+ rpc_wallet_tests.cpp
endif
nodist_test_bitcoin_SOURCES = $(BUILT_SOURCES)
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-05 16:21:26 +0000