From ee877e524b419eff87be1acac63c5080cf7dd0e5 Mon Sep 17 00:00:00 2001 From: Ross Nicoll Date: Fri, 28 Mar 2014 00:27:24 +0000 Subject: [PATCH] Update binary names to match dogecoind and dogecoin-qt. --- configure.ac | 2 +- src/Makefile.am | 14 +++++++------- src/qt/Makefile.am | 20 ++++++++++---------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/configure.ac b/configure.ac index 2a971d005..b6eab592b 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ define(_CLIENT_VERSION_REVISION, 0) define(_CLIENT_VERSION_BUILD, 0) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2014) -AC_INIT([Dogecoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[info@bitcoin.org],[dogecoin]) +AC_INIT([Dogecoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[info@bitcoin.org],[bitcoin]) AC_CONFIG_AUX_DIR([src/build-aux]) AC_CONFIG_MACRO_DIR([src/m4]) AC_CANONICAL_HOST diff --git a/src/Makefile.am b/src/Makefile.am index 4ed27688e..a12bbc753 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -13,7 +13,7 @@ endif bin_PROGRAMS = if BUILD_BITCOIND - bin_PROGRAMS += bitcoind + bin_PROGRAMS += dogecoind endif if BUILD_BITCOIN_CLI @@ -146,25 +146,25 @@ libbitcoin_cli_a_SOURCES = \ nodist_libbitcoin_common_a_SOURCES = $(top_srcdir)/src/obj/build.h # -# bitcoind binary # -bitcoind_LDADD = \ +# dogecoind binary # +dogecoind_LDADD = \ libbitcoin_server.a \ libbitcoin_cli.a \ libbitcoin_common.a \ $(LIBLEVELDB) \ $(LIBMEMENV) if ENABLE_WALLET -bitcoind_LDADD += libbitcoin_wallet.a +dogecoind_LDADD += libbitcoin_wallet.a endif -bitcoind_SOURCES = bitcoind.cpp +dogecoind_SOURCES = dogecoind.cpp # if TARGET_WINDOWS -bitcoind_SOURCES += bitcoind-res.rc +dogecoind_SOURCES += dogecoind-res.rc endif AM_CPPFLAGS += $(BDB_CPPFLAGS) -bitcoind_LDADD += $(BOOST_LIBS) $(BDB_LIBS) +dogecoind_LDADD += $(BOOST_LIBS) $(BDB_LIBS) # bitcoin-cli binary # bitcoin_cli_LDADD = \ diff --git a/src/qt/Makefile.am b/src/qt/Makefile.am index 0df518fbb..11e8ff274 100644 --- a/src/qt/Makefile.am +++ b/src/qt/Makefile.am @@ -5,7 +5,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/src \ -I$(top_builddir)/src/qt/forms \ $(PROTOBUF_CFLAGS) \ $(QR_CFLAGS) -bin_PROGRAMS = bitcoin-qt +bin_PROGRAMS = dogecoin-qt noinst_LIBRARIES = libbitcoinqt.a SUBDIRS = $(BUILD_TEST_QT) DIST_SUBDIRS = test @@ -334,23 +334,23 @@ BUILT_SOURCES = $(nodist_libbitcoinqt_a_SOURCES) $(QT_MOC): $(PROTOBUF_H) $(QT_MOC_CPP): $(PROTOBUF_H) -# bitcoin-qt binary # -bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) \ +# dogecoin-qt binary # +dogecoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) \ -I$(top_srcdir)/src/qt/forms -bitcoin_qt_SOURCES = bitcoin.cpp +dogecoin_qt_SOURCES = bitcoin.cpp if TARGET_DARWIN - bitcoin_qt_SOURCES += $(BITCOIN_MM) + dogecoin_qt_SOURCES += $(BITCOIN_MM) endif if TARGET_WINDOWS - bitcoin_qt_SOURCES += $(BITCOIN_RC) + dogecoin_qt_SOURCES += $(BITCOIN_RC) endif -bitcoin_qt_LDADD = libbitcoinqt.a $(LIBBITCOIN_SERVER) +dogecoin_qt_LDADD = libbitcoinqt.a $(LIBBITCOIN_SERVER) if ENABLE_WALLET -bitcoin_qt_LDADD += $(LIBBITCOIN_WALLET) +dogecoin_qt_LDADD += $(LIBBITCOIN_WALLET) endif -bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBLEVELDB) $(LIBMEMENV) \ +dogecoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBLEVELDB) $(LIBMEMENV) \ $(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS) -bitcoin_qt_LDFLAGS = $(QT_LDFLAGS) +dogecoin_qt_LDFLAGS = $(QT_LDFLAGS) # forms/foo.h -> forms/ui_foo.h QT_FORMS_H=$(join $(dir $(QT_FORMS_UI)),$(addprefix ui_, $(notdir $(QT_FORMS_UI:.ui=.h))))