Skip to content
Permalink
Browse files

update makefile's and config

  • Loading branch information...
observerdev committed Jul 2, 2019
1 parent 266dec5 commit ed51e74a62b0c8c0e97a92427b51d2783a29aae1
Showing with 89 additions and 72 deletions.
  1. +11 −4 Makefile.am
  2. +7 −4 configure.ac
  3. +29 −14 src/Makefile.am
  4. +33 −44 src/Makefile.qt.include
  5. +9 −6 src/Makefile.test.include
@@ -51,11 +51,15 @@ DIST_SHARE = \
BIN_CHECKS=$(top_srcdir)/contrib/devtools/symbol-check.py \
$(top_srcdir)/contrib/devtools/security-check.py

WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/bitcoin.ico \
WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/obsr.ico \
$(top_srcdir)/share/pixmaps/nsis-header.bmp \
$(top_srcdir)/share/pixmaps/nsis-wizard.bmp \
$(top_srcdir)/doc/README_windows.txt

LINUX_PACKAGING = $(top_srcdir)/share/pixmaps/obsr16.xpm \
$(top_srcdir)/share/pixmaps/obsr32.xpm \
$(top_srcdir)/share/pixmaps/obsr128.png

OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_FANCY_PLIST) $(OSX_INSTALLER_ICONS) \
$(top_srcdir)/contrib/macdeploy/$(OSX_BACKGROUND_SVG) \
$(OSX_DSSTORE_GEN) \
@@ -169,7 +173,7 @@ $(BITCOIN_CLI_BIN): FORCE
$(MAKE) -C src $(@F)

if USE_LCOV
LCOV_FILTER_PATTERN=-p "/usr/include/" -p "src/leveldb/" -p "src/univalue" -p "src/secp256k1"
LCOV_FILTER_PATTERN=-p "/usr/include/" -p "/usr/lib/" -p "src/leveldb/" -p "src/univalue" -p "src/secp256k1"

baseline.info:
$(LCOV) -c -i -d $(abs_builddir)/src -o $@
@@ -216,7 +220,10 @@ endif

dist_noinst_SCRIPTS = autogen.sh

EXTRA_DIST = $(DIST_SHARE) test/functional/test_runner.py test/functional $(DIST_CONTRIB) $(DIST_DOCS) $(WINDOWS_PACKAGING) $(OSX_PACKAGING) $(BIN_CHECKS)
EXTRA_DIST = $(DIST_SHARE) $(DIST_CONTRIB) $(DIST_DOCS) $(WINDOWS_PACKAGING) $(LINUX_PACKAGING) $(OSX_PACKAGING) $(BIN_CHECKS)

EXTRA_DIST += \
test/functional

EXTRA_DIST += \
test/util/bitcoin-util-test.py \
@@ -263,5 +270,5 @@ clean-docs:

clean-local: clean-docs
rm -rf coverage_percent.txt test_obsr.coverage/ total.coverage/ test/tmp/ cache/ $(OSX_APP)
rm -rf test/functional/__pycache__ test/functional/test_framework/__pycache__ test/cache
rm -rf test/functional/__pycache__ test/functional/test_framework/__pycache__ test/cache share/rpcauth/__pycache__

@@ -1,7 +1,7 @@
dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 1)
define(_CLIENT_VERSION_MINOR, 1)
define(_CLIENT_VERSION_MAJOR, 3)
define(_CLIENT_VERSION_MINOR, 3)
define(_CLIENT_VERSION_REVISION, 99)
define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_IS_RELEASE, false)
@@ -81,8 +81,8 @@ AC_PATH_TOOL(RANLIB, ranlib)
AC_PATH_TOOL(STRIP, strip)
AC_PATH_TOOL(GCOV, gcov)
AC_PATH_PROG(LCOV, lcov)
dnl Python 3.x is supported from 3.4 on (see https://github.com/bitcoin/bitcoin/issues/7893)
AC_PATH_PROGS([PYTHON], [python3.7 python3.6 python3.5 python3.4 python3 python])
dnl Python 3.5 is specified in .python-version and should be used if available, see doc/dependencies.md
AC_PATH_PROGS([PYTHON], [python3.5 python3.6 python3.7 python3.8 python3 python])
AC_PATH_PROG(GENHTML, genhtml)
AC_PATH_PROG([GIT], [git])
AC_PATH_PROG(CCACHE,ccache)
@@ -1310,6 +1310,9 @@ openssl)
;;
esac

AM_CONDITIONAL([USE_NUM_GMP], [test "x$set_bignum" = "xgmp"])
AM_CONDITIONAL([USE_NUM_OPENSSL], [test "x$set_bignum" = "xopenssl"])

AC_MSG_CHECKING([whether to build test_obsr])
if test x$use_tests = xyes; then
AC_MSG_RESULT([yes])
@@ -106,7 +106,7 @@ BITCOIN_CORE_H = \
denomination_functions.h \
obfuscation.h \
obfuscation-relay.h \
db.h \
wallet/db.h \
hash.h \
httprpc.h \
httpserver.h \
@@ -162,7 +162,7 @@ BITCOIN_CORE_H = \
torcontrol.h \
txdb.h \
txmempool.h \
ui_interface.h \
guiinterface.h \
uint256.h \
undo.h \
util.h \
@@ -171,9 +171,9 @@ BITCOIN_CORE_H = \
utiltime.h \
validationinterface.h \
version.h \
wallet.h \
wallet_ismine.h \
walletdb.h \
wallet/wallet.h \
wallet/wallet_ismine.h \
wallet/walletdb.h \
zobsrchain.h \
zobsr/accumulators.h \
zobsr/accumulatorcheckpoints.h \
@@ -185,6 +185,7 @@ BITCOIN_CORE_H = \
zobsr/zerocoin.h \
zobsr/zobsrtracker.h \
zobsr/zobsrwallet.h \
zobsr/zobsrmodule.h \
genwit.h \
concurrentqueue.h \
lightzobsrthread.h \
@@ -257,7 +258,7 @@ libbitcoin_wallet_a_SOURCES = \
denomination_functions.cpp \
obfuscation.cpp \
obfuscation-relay.cpp \
db.cpp \
wallet/db.cpp \
crypter.cpp \
swifttx.cpp \
masternode.cpp \
@@ -266,21 +267,22 @@ libbitcoin_wallet_a_SOURCES = \
masternode-sync.cpp \
masternodeconfig.cpp \
masternodeman.cpp \
rpcdump.cpp \
wallet/rpcdump.cpp \
wallet/rpcwallet.cpp \
kernel.cpp \
wallet/wallet.cpp \
wallet/wallet_ismine.cpp \
wallet/walletdb.cpp \
zobsr/deterministicmint.cpp \
zobsr/zerocoin.cpp \
rpcwallet.cpp \
kernel.cpp \
wallet.cpp \
wallet_ismine.cpp \
walletdb.cpp \
zobsr/accumulators.cpp \
zobsr/mintpool.cpp \
zobsr/witness.cpp \
zobsr/zobsrwallet.cpp \
zobsr/zobsrtracker.cpp \
stakeinput.cpp \
genwit.cpp \
zobsr/zobsrmodule.cpp \
lightzobsrthread.cpp \
$(BITCOIN_CORE_H)

@@ -336,6 +338,7 @@ libzerocoin_libbitcoin_zerocoin_a_SOURCES = \
libzerocoin/SerialNumberSignatureOfKnowledge.h \
libzerocoin/SpendType.h \
libzerocoin/ZerocoinDefines.h \
libzerocoin/bignum.cpp \
libzerocoin/Accumulator.cpp \
libzerocoin/AccumulatorProofOfKnowledge.cpp \
libzerocoin/Coin.cpp \
@@ -345,6 +348,12 @@ libzerocoin_libbitcoin_zerocoin_a_SOURCES = \
libzerocoin/ParamGeneration.cpp \
libzerocoin/Params.cpp \
libzerocoin/SerialNumberSignatureOfKnowledge.cpp
if USE_NUM_GMP
libzerocoin_libbitcoin_zerocoin_a_SOURCES += libzerocoin/bignum_gmp.cpp
endif
if USE_NUM_OPENSSL
libzerocoin_libbitcoin_zerocoin_a_SOURCES += libzerocoin/bignum_openssl.cpp
endif

# common: shared between obsrd, and obsr-qt and non-server tools
libbitcoin_common_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
@@ -523,10 +532,16 @@ CLEANFILES = $(EXTRA_LIBRARIES)
CLEANFILES += *.gcda *.gcno
CLEANFILES += compat/*.gcda compat/*.gcno
CLEANFILES += crypto/*.gcda crypto/*.gcno
CLEANFILES += libzerocoin/*.gcda libzerocoin/*.gcno
CLEANFILES += primitives/*.gcda primitives/*.gcno
CLEANFILES += rpc/*.gcda rpc/*.gcno
CLEANFILES += script/*.gcda script/*.gcno
CLEANFILES += support/*.gcda support/*.gcno
CLEANFILES += univalue/*.gcda univalue/*.gcno
CLEANFILES += wallet/*.gcda wallet/*.gcno
CLEANFILES += wallet/test/*.gcda wallet/test/*.gcno
CLEANFILES += zmq/*.gcda zmq/*.gcno
CLEANFILES += zobsr/*.gcda zobsr/*.gcno
CLEANFILES += obj/build.h

EXTRA_DIST =
@@ -554,13 +569,13 @@ clean-local:
check-symbols: $(bin_PROGRAMS)
if GLIBC_BACK_COMPAT
@echo "Checking glibc back compat..."
$(AM_V_at) READELF=$(READELF) CPPFILT=$(CPPFILT) $(top_srcdir)/contrib/devtools/symbol-check.py < $(bin_PROGRAMS)
$(AM_V_at) READELF=$(READELF) CPPFILT=$(CPPFILT) $(PYTHON) $(top_srcdir)/contrib/devtools/symbol-check.py < $(bin_PROGRAMS)
endif

check-security: $(bin_PROGRAMS)
if HARDEN
@echo "Checking binary security..."
$(AM_V_at) READELF=$(READELF) OBJDUMP=$(OBJDUMP) $(top_srcdir)/contrib/devtools/security-check.py < $(bin_PROGRAMS)
$(AM_V_at) READELF=$(READELF) OBJDUMP=$(OBJDUMP) $(PYTHON) $(top_srcdir)/contrib/devtools/security-check.py < $(bin_PROGRAMS)
endif

%.pb.cc %.pb.h: %.proto
@@ -8,46 +8,45 @@ EXTRA_LIBRARIES += qt/libbitcoinqt.a
# obsr qt core #
QT_TS = \
qt/locale/obsr_bg.ts \
qt/locale/obsr_ca.ts \
qt/locale/obsr_cs.ts \
qt/locale/obsr_da.ts \
qt/locale/obsr_de.ts \
qt/locale/obsr_en.ts \
qt/locale/obsr_en_GB.ts \
qt/locale/obsr_en_US.ts \
qt/locale/obsr_eo.ts \
qt/locale/obsr_es.ts \
qt/locale/obsr_es_ES.ts \
qt/locale/obsr_fi.ts \
qt/locale/obsr_fr_FR.ts \
qt/locale/obsr_hi_IN.ts \
qt/locale/obsr_hr.ts \
qt/locale/obsr_hr_HR.ts \
qt/locale/obsr_it.ts \
qt/locale/obsr_ja.ts \
qt/locale/obsr_ko_KR.ts \
qt/locale/obsr_lt_LT.ts \
qt/locale/obsr_nl.ts \
qt/locale/obsr_pl.ts \
qt/locale/obsr_pt.ts \
qt/locale/obsr_pt_BR.ts \
qt/locale/obsr_ro_RO.ts \
qt/locale/obsr_ru.ts \
qt/locale/obsr_sk.ts \
qt/locale/obsr_sv.ts \
qt/locale/obsr_tr.ts \
qt/locale/obsr_uk.ts \
qt/locale/obsr_vi.ts \
qt/locale/obsr_zh_CN.ts \
qt/locale/obsr_zh_TW.ts
qt/locale/obsr_ca.ts \
qt/locale/obsr_cs.ts \
qt/locale/obsr_da.ts \
qt/locale/obsr_de.ts \
qt/locale/obsr_en.ts \
qt/locale/obsr_en_GB.ts \
qt/locale/obsr_en_US.ts \
qt/locale/obsr_eo.ts \
qt/locale/obsr_es.ts \
qt/locale/obsr_es_ES.ts \
qt/locale/obsr_fi.ts \
qt/locale/obsr_fr_FR.ts \
qt/locale/obsr_hi_IN.ts \
qt/locale/obsr_hr.ts \
qt/locale/obsr_hr_HR.ts \
qt/locale/obsr_it.ts \
qt/locale/obsr_ja.ts \
qt/locale/obsr_ko_KR.ts \
qt/locale/obsr_lt_LT.ts \
qt/locale/obsr_nl.ts \
qt/locale/obsr_pl.ts \
qt/locale/obsr_pt.ts \
qt/locale/obsr_pt_BR.ts \
qt/locale/obsr_ro_RO.ts \
qt/locale/obsr_ru.ts \
qt/locale/obsr_sk.ts \
qt/locale/obsr_sv.ts \
qt/locale/obsr_tr.ts \
qt/locale/obsr_uk.ts \
qt/locale/obsr_vi.ts \
qt/locale/obsr_zh_CN.ts \
qt/locale/obsr_zh_TW.ts

QT_FORMS_UI = \
qt/forms/addressbookpage.ui \
qt/forms/askpassphrasedialog.ui \
qt/forms/bip38tooldialog.ui \
qt/forms/coincontroldialog.ui \
qt/forms/blockexplorer.ui \
qt/forms/obfuscationconfig.ui \
qt/forms/editaddressdialog.ui \
qt/forms/governancepage.ui \
qt/forms/helpmessagedialog.ui \
@@ -83,7 +82,6 @@ QT_MOC_CPP = \
qt/moc_coincontroldialog.cpp \
qt/moc_coincontroltreewidget.cpp \
qt/moc_csvmodelwriter.cpp \
qt/moc_obfuscationconfig.cpp \
qt/moc_editaddressdialog.cpp \
qt/moc_governancepage.cpp \
qt/moc_guiutil.cpp \
@@ -159,7 +157,6 @@ BITCOIN_QT_H = \
qt/coincontroldialog.h \
qt/coincontroltreewidget.h \
qt/csvmodelwriter.h \
qt/obfuscationconfig.h \
qt/editaddressdialog.h \
qt/governancepage.h \
qt/guiconstants.h \
@@ -216,10 +213,7 @@ RES_ICONS = \
qt/res/icons/bitcoin.png \
qt/res/icons/bitcoin_testnet.ico \
qt/res/icons/bitcoin_testnet.png \
qt/res/icons/bitcoin_regtest.ico \
qt/res/icons/bitcoin_regtest.png \
qt/res/icons/bitcoin_unittest.ico \
qt/res/icons/bitcoin_unittest.png \
qt/res/icons/browse.png \
qt/res/icons/clock1.png \
qt/res/icons/clock2.png \
@@ -315,7 +309,6 @@ BITCOIN_QT_WALLET_CPP = \
qt/blockexplorer.cpp \
qt/coincontroldialog.cpp \
qt/coincontroltreewidget.cpp \
qt/obfuscationconfig.cpp \
qt/editaddressdialog.cpp \
qt/governancepage.cpp \
qt/masternodelist.cpp \
@@ -358,7 +351,6 @@ RES_IMAGES = \
qt/res/images/splash.png \
qt/res/images/splash_testnet.png \
qt/res/images/splash_regtest.png \
qt/res/images/splash_unittest.png \
qt/res/images/obsr_logo_horizontal.png \
qt/res/images/downArrow_dark.png \
qt/res/images/downArrow_small_dark.png \
@@ -367,10 +359,7 @@ RES_IMAGES = \
qt/res/images/upArrow_small.png \
qt/res/images/leftArrow_small_dark.png \
qt/res/images/rightArrow_small_dark.png \
qt/res/images/qtreeview_selected.png \
qt/res/images/walletFrame.png \
qt/res/images/walletFrame_bg.png \
qt/res/images/walletFrame_bg.png
qt/res/images/qtreeview_selected.png

RES_CSS = \
qt/res/css/default.css

0 comments on commit ed51e74

Please sign in to comment.
You can’t perform that action at this time.