diff --git a/configure.ac b/configure.ac index 14afdeda17..83509ed102 100644 --- a/configure.ac +++ b/configure.ac @@ -666,7 +666,7 @@ AC_ARG_ENABLE([util-util], AC_ARG_ENABLE([experimental-util-chainstate], [AS_HELP_STRING([--enable-experimental-util-chainstate], - [build experimental bitcoin-chainstate executable (default=no)])], + [build experimental blackmore-chainstate executable (default=no)])], [build_bitcoin_chainstate=$enableval], [build_bitcoin_chainstate=no]) @@ -1681,7 +1681,7 @@ AC_MSG_RESULT($build_bitcoin_util) AC_MSG_CHECKING([whether to build experimental bitcoin-chainstate]) if test "$build_bitcoin_chainstate" = "yes"; then if test "$build_experimental_kernel_lib" = "no"; then - AC_MSG_ERROR([experimental bitcoin-chainstate cannot be built without the experimental bitcoinkernel library. Use --with-experimental-kernel-lib]); + AC_MSG_ERROR([experimental blackmore-chainstate cannot be built without the experimental bitcoinkernel library. Use --with-experimental-kernel-lib]); fi fi AM_CONDITIONAL([BUILD_BITCOIN_CHAINSTATE], [test $build_bitcoin_chainstate = "yes"]) @@ -1803,7 +1803,7 @@ if test "$bitcoin_enable_qt" != "no"; then AC_MSG_WARN([xgettext is required to update qt translations]) fi - AC_MSG_CHECKING([whether to build test_bitcoin-qt]) + AC_MSG_CHECKING([whether to build test_blackmore-qt]) if test "$use_gui_tests$bitcoin_enable_qt_test" = "yesyes"; then AC_MSG_RESULT([yes]) BUILD_TEST_QT="yes" @@ -1812,7 +1812,7 @@ if test "$bitcoin_enable_qt" != "no"; then fi fi -AC_MSG_CHECKING([whether to build test_bitcoin]) +AC_MSG_CHECKING([whether to build test_blackmore]) if test "$use_tests" = "yes"; then if test "$enable_fuzz" = "yes"; then AC_MSG_RESULT([no, because fuzzing is enabled]) @@ -2008,7 +2008,7 @@ echo " with zmq = $use_zmq" if test $enable_fuzz = "no"; then echo " with test = $use_tests" else - echo " with test = not building test_bitcoin because fuzzing is enabled" + echo " with test = not building test_blackmore because fuzzing is enabled" fi echo " with fuzz binary = $enable_fuzz_binary" echo " with bench = $use_bench" diff --git a/src/Makefile.am b/src/Makefile.am index 7d7353c70f..4dbe2994da 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -111,7 +111,7 @@ if BUILD_BITCOIN_UTIL endif if BUILD_BITCOIN_CHAINSTATE - bin_PROGRAMS += bitcoin-chainstate + bin_PROGRAMS += blackmore-chainstate endif .PHONY: FORCE check-symbols check-security @@ -900,17 +900,17 @@ blackmore_util_LDADD = \ $(LIBSECP256K1) # -# bitcoin-chainstate binary # -bitcoin_chainstate_SOURCES = bitcoin-chainstate.cpp -bitcoin_chainstate_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BOOST_CPPFLAGS) -bitcoin_chainstate_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) +# blackmore-chainstate binary # +blackmore_chainstate_SOURCES = bitcoin-chainstate.cpp +blackmore_chainstate_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BOOST_CPPFLAGS) +blackmore_chainstate_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) -bitcoin_chainstate_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(PTHREAD_FLAGS) $(LIBTOOL_APP_LDFLAGS) -static -bitcoin_chainstate_LDADD = $(LIBBITCOINKERNEL) +blackmore_chainstate_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(PTHREAD_FLAGS) $(LIBTOOL_APP_LDFLAGS) -static +blackmore_chainstate_LDADD = $(LIBBITCOINKERNEL) # libtool is unable to calculate this indirect dependency, presumably because it's a subproject. # libsecp256k1 only needs to be linked in when libbitcoinkernel is static. -bitcoin_chainstate_LDADD += $(LIBSECP256K1) +blackmore_chainstate_LDADD += $(LIBSECP256K1) # # bitcoinkernel library # diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index 94dd9db978..968a77ceb9 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -407,7 +407,7 @@ bitcoin_qt_apk: FORCE cp $(dir $(lastword $(CC)))../sysroot/usr/lib/$(host_alias)/libc++_shared.so $(APK_LIB_DIR) tar xf $(QT_BASE_PATH) -C qt/android/src/ $(QT_BASE_TLD)src/android/jar/src --strip-components=5 tar xf $(QT_BASE_PATH) -C qt/android/src/ $(QT_BASE_TLD)src/android/java/src --strip-components=5 - cp qt/bitcoin-qt $(APK_LIB_DIR)/libbitcoin-qt_$(ANDROID_ARCH).so + cp qt/blackmore-qt $(APK_LIB_DIR)/libbitcoin-qt_$(ANDROID_ARCH).so cd qt/android && gradle wrapper --gradle-version=6.6.1 cd qt/android && ./gradlew build