No OneTemporary
Actions

Size

22 KB

Subscribers

None

View Options

	diff --git a/src/Makefile.am b/src/Makefile.am
	index 85d7c3c9c6..9917be2481 100644
	--- a/src/Makefile.am
	+++ b/src/Makefile.am
	@@ -1,138 +1,189 @@
	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

	bin_PROGRAMS = bitcoind bitcoin-cli

	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
	@$(MKDIR_P) $(abs_top_builddir)/src/obj
	@$(top_srcdir)/share/genbuild.sh $(abs_top_builddir)/src/obj/build.h \
	$(abs_top_srcdir)
	version.o: obj/build.h

	libbitcoin_server_a_SOURCES = \
	addrman.cpp \
	alert.cpp \
	rpcserver.cpp \
	bloom.cpp \
	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 = \
	allocators.cpp \
	chainparams.cpp \
	core.cpp \
	hash.cpp \
	key.cpp \
	netbase.cpp \
	protocol.cpp \
	rpcprotocol.cpp \
	script.cpp \
	sync.cpp \
	util.cpp \
	version.cpp \
	$(BITCOIN_CORE_H)

	libbitcoin_cli_a_SOURCES = \
	rpcclient.cpp \
	$(BITCOIN_CORE_H)

	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
	bitcoind_SOURCES = bitcoind.cpp
	#

	if TARGET_WINDOWS
	bitcoind_SOURCES += bitcoind-res.rc
	endif

	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
	#

	if TARGET_WINDOWS
	bitcoin_cli_SOURCES += bitcoin-cli-res.rc
	endif

	leveldb/libleveldb.a: leveldb/libmemenv.a

	leveldb/%.a:
	@echo "Building LevelDB ..." && $(MAKE) -C $(@D) $(@F) CXX="$(CXX)" \
	CC="$(CC)" PLATFORM=$(TARGET_OS) AR="$(AR)" $(LEVELDB_TARGET_FLAGS) \
	OPT="$(CXXFLAGS) $(CPPFLAGS)"

	qt/bitcoinstrings.cpp: $(libbitcoin_server_a_SOURCES) $(libbitcoin_common_a_SOURCES) $(libbitcoin_cli_a_SOURCES)
	@test -n $(XGETTEXT) \|\| echo "xgettext is required for updating translations"
	@cd $(top_srcdir); XGETTEXT=$(XGETTEXT) share/qt/extract_strings_qt.py

	CLEANFILES = leveldb/libleveldb.a leveldb/libmemenv.a .gcda .gcno

	DISTCLEANFILES = obj/build.h

	EXTRA_DIST = leveldb Makefile.include

	clean-local:
	-$(MAKE) -C leveldb clean
	rm -f leveldb//.gcno leveldb/helpers/memenv/*.gcno
	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
	@@ -1,267 +1,358 @@
	include $(top_srcdir)/src/Makefile.include

	AM_CPPFLAGS += -I$(top_srcdir)/src \
	-I$(top_builddir)/src/qt \
	-I$(top_builddir)/src/qt/forms \
	$(PROTOBUF_CFLAGS) \
	$(QR_CFLAGS)
	bin_PROGRAMS = bitcoin-qt
	noinst_LIBRARIES = libbitcoinqt.a
	SUBDIRS = $(BUILD_TEST_QT)
	DIST_SUBDIRS = test

	# bitcoin qt core #
	QT_TS = \
	locale/bitcoin_ach.ts \
	locale/bitcoin_af_ZA.ts \
	locale/bitcoin_ar.ts \
	locale/bitcoin_be_BY.ts \
	locale/bitcoin_bg.ts \
	locale/bitcoin_bs.ts \
	locale/bitcoin_ca_ES.ts \
	locale/bitcoin_ca.ts \
	locale/bitcoin_cs.ts \
	locale/bitcoin_cy.ts \
	locale/bitcoin_da.ts \
	locale/bitcoin_de_AT.ts \
	locale/bitcoin_de.ts \
	locale/bitcoin_el_GR.ts \
	locale/bitcoin_en.ts \
	locale/bitcoin_eo.ts \
	locale/bitcoin_es_CL.ts \
	locale/bitcoin_es_MX.ts \
	locale/bitcoin_es.ts \
	locale/bitcoin_et.ts \
	locale/bitcoin_eu_ES.ts \
	locale/bitcoin_fa_IR.ts \
	locale/bitcoin_fa.ts \
	locale/bitcoin_fi.ts \
	locale/bitcoin_fr_CA.ts \
	locale/bitcoin_fr.ts \
	locale/bitcoin_gl.ts \
	locale/bitcoin_gu_IN.ts \
	locale/bitcoin_he.ts \
	locale/bitcoin_hi_IN.ts \
	locale/bitcoin_hr.ts \
	locale/bitcoin_hu.ts \
	locale/bitcoin_id_ID.ts \
	locale/bitcoin_it.ts \
	locale/bitcoin_ja.ts \
	locale/bitcoin_kk_KZ.ts \
	locale/bitcoin_ko_KR.ts \
	locale/bitcoin_la.ts \
	locale/bitcoin_lt.ts \
	locale/bitcoin_lv_LV.ts \
	locale/bitcoin_ms_MY.ts \
	locale/bitcoin_nb.ts \
	locale/bitcoin_nl.ts \
	locale/bitcoin_pam.ts \
	locale/bitcoin_pl.ts \
	locale/bitcoin_pt_BR.ts \
	locale/bitcoin_pt_PT.ts \
	locale/bitcoin_ro_RO.ts \
	locale/bitcoin_ru.ts \
	locale/bitcoin_sk.ts \
	locale/bitcoin_sl_SI.ts \
	locale/bitcoin_sq.ts \
	locale/bitcoin_sr.ts \
	locale/bitcoin_sv.ts \
	locale/bitcoin_th_TH.ts \
	locale/bitcoin_tr.ts \
	locale/bitcoin_uk.ts \
	locale/bitcoin_vi.ts \
	locale/bitcoin_vi_VN.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

	QT_MOC = intro.moc overviewpage.moc rpcconsole.moc bitcoin.moc

	QT_QRC_CPP = qrc_bitcoin.cpp
	QT_QRC = bitcoin.qrc

	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 = \
	aboutdialog.cpp \
	bitcoinaddressvalidator.cpp \
	bitcoinamountfield.cpp \
	bitcoin.cpp \
	bitcoingui.cpp \
	bitcoinunits.cpp \
	clientmodel.cpp \
	csvmodelwriter.cpp \
	guiutil.cpp \
	intro.cpp \
	monitoreddatamapper.cpp \
	notificator.cpp \
	optionsdialog.cpp \
	optionsmodel.cpp \
	qvalidatedlineedit.cpp \
	qvaluecombobox.cpp \
	rpcconsole.cpp \
	signverifymessagedialog.cpp \
	splashscreen.cpp \
	trafficgraphwidget.cpp

	if ENABLE_WALLET
	BITCOIN_QT_CPP += \
	addressbookpage.cpp \
	addresstablemodel.cpp \
	askpassphrasedialog.cpp \
	coincontroldialog.cpp \
	coincontroltreewidget.cpp \
	editaddressdialog.cpp \
	openuridialog.cpp \
	overviewpage.cpp \
	paymentrequestplus.cpp \
	paymentserver.cpp \
	receivecoinsdialog.cpp \
	receiverequestdialog.cpp \
	recentrequeststablemodel.cpp \
	sendcoinsdialog.cpp \
	sendcoinsentry.cpp \
	transactiondesc.cpp \
	transactiondescdialog.cpp \
	transactionfilterproxy.cpp \
	transactionrecord.cpp \
	transactiontablemodel.cpp \
	transactionview.cpp \
	walletframe.cpp \
	walletmodel.cpp \
	walletmodeltransaction.cpp \
	walletview.cpp
	endif

	RES_IMAGES = res/images/about.png res/images/splash.png \
	res/images/splash_testnet.png

	RES_MOVIES = res/movies/update_spinner.mng

	BITCOIN_RC = res/bitcoin-qt-res.rc

	libbitcoinqt_a_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) \
	-I$(top_srcdir)/src/qt/forms $(QT_DBUS_INCLUDES)
	libbitcoinqt_a_SOURCES = $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(QT_FORMS_UI) \
	$(QT_QRC) $(QT_TS) $(PROTOBUF_PROTO) $(RES_ICONS) $(RES_IMAGES) $(RES_MOVIES)

	nodist_libbitcoinqt_a_SOURCES = $(QT_MOC_CPP) $(QT_MOC) $(PROTOBUF_CC) \
	$(PROTOBUF_H) $(QT_QRC_CPP)

	BUILT_SOURCES = $(nodist_libbitcoinqt_a_SOURCES)

	#Generating these with a half-written protobuf header leads to wacky results.
	#This makes sure it's done.
	$(QT_MOC): $(PROTOBUF_H)
	$(QT_MOC_CPP): $(PROTOBUF_H)

	if TARGET_DARWIN
	libbitcoinqt_a_SOURCES += $(BITCOIN_MM)
	endif
	if TARGET_WINDOWS
	libbitcoinqt_a_SOURCES += $(BITCOIN_RC)
	endif
	#

	# bitcoin-qt binary #
	bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) \
	-I$(top_srcdir)/src/qt/forms
	bitcoin_qt_SOURCES = bitcoin.cpp
	bitcoin_qt_LDADD = libbitcoinqt.a $(LIBBITCOIN_SERVER)
	if ENABLE_WALLET
	bitcoin_qt_LDADD += $(LIBBITCOIN_WALLET)
	endif
	bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBLEVELDB) $(LIBMEMENV) \
	$(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS)

	# forms/foo.h -> forms/ui_foo.h
	QT_FORMS_H=$(join $(dir $(QT_FORMS_UI)),$(addprefix ui_, $(notdir $(QT_FORMS_UI:.ui=.h))))

	#locale/foo.ts -> locale/foo.qm
	QT_QM=$(QT_TS:.ts=.qm)

	.PHONY: FORCE
	.SECONDARY: $(QT_QM)

	bitcoinstrings.cpp: FORCE
	$(MAKE) -C $(top_srcdir)/src qt/bitcoinstrings.cpp

	translate: bitcoinstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(BITCOIN_MM)
	@test -n $(LUPDATE) \|\| echo "lupdate is required for updating translations"
	@QT_SELECT=$(QT_SELECT) $(LUPDATE) $^ -locations relative -no-obsolete -ts locale/bitcoin_en.ts

	$(QT_QRC_CPP): $(QT_QRC) $(QT_QM) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_MOVIES) $(PROTOBUF_H)
	@cd $(abs_srcdir); test -f $(RCC) && QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin -o $(abs_builddir)/$@ $< \|\| \
	echo error: could not build $@
	$(SED) -i.bak -e '/^\\.*Created:/d' $@ && rm $@.bak
	$(SED) -i.bak -e '/^\\.*by:/d' $@ && rm $@.bak

	CLEANFILES = $(BUILT_SOURCES) $(QT_QM) $(QT_FORMS_H) .gcda .gcno
	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
	@@ -1,36 +1,43 @@
	include $(top_srcdir)/src/Makefile.include

	AM_CPPFLAGS += -I$(top_srcdir)/src \
	-I$(top_srcdir)/src/qt \
	-I$(top_builddir)/src/qt \
	$(PROTOBUF_CFLAGS) \
	$(QR_CFLAGS)
	bin_PROGRAMS = test_bitcoin-qt
	TESTS = test_bitcoin-qt

	TEST_QT_MOC_CPP = moc_uritests.cpp

	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)
	if ENABLE_WALLET
	test_bitcoin_qt_LDADD += $(LIBBITCOIN_WALLET)
	endif
	test_bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBLEVELDB) \
	$(LIBMEMENV) $(BOOST_LIBS) $(QT_DBUS_LIBS) $(QT_TEST_LIBS) $(QT_LIBS) \
	$(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS)

	CLEANFILES = $(BUILT_SOURCES) .gcda .gcno

	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
	@@ -1,46 +1,73 @@
	include $(top_srcdir)/src/Makefile.include

	AM_CPPFLAGS += -I$(top_srcdir)/src

	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

	BUILT_SOURCES = $(JSON_TEST_FILES:.json=.json.h) $(RAW_TEST_FILES:.raw=.raw.h)

	# test_bitcoin binary #
	test_bitcoin_CPPFLAGS = $(AM_CPPFLAGS) $(TESTDEFS)
	test_bitcoin_LDADD = $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBLEVELDB) $(LIBMEMENV) \
	$(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
	if ENABLE_WALLET
	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)

	CLEANFILES = .gcda .gcno $(BUILT_SOURCES)

File Metadata

Mime Type: text/x-diff
Expires: Thu, Apr 17, 03:44 (8 h, 35 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 5508737
Default Alt Text: (22 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions