Skip to content

Commit

Permalink
binaries renamed to proper MasterCore names
Browse files Browse the repository at this point in the history
  • Loading branch information
m21 committed Sep 26, 2014
1 parent 4826a98 commit ba5559c
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 22 deletions.
6 changes: 3 additions & 3 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ SUBDIRS = src

GZIP_ENV="-9n"

BITCOIND_BIN=$(top_builddir)/src/bitcoind$(EXEEXT)
BITCOIN_QT_BIN=$(top_builddir)/src/qt/bitcoin-qt$(EXEEXT)
BITCOIN_CLI_BIN=$(top_builddir)/src/bitcoin-cli$(EXEEXT)
BITCOIND_BIN=$(top_builddir)/src/mastercored$(EXEEXT)
BITCOIN_QT_BIN=$(top_builddir)/src/qt/mastercore-qt$(EXEEXT)
BITCOIN_CLI_BIN=$(top_builddir)/src/mastercore-cli$(EXEEXT)
BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)

OSX_APP=Bitcoin-Qt.app
Expand Down
20 changes: 10 additions & 10 deletions src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ endif
bin_PROGRAMS =

if BUILD_BITCOIND
bin_PROGRAMS += bitcoind
bin_PROGRAMS += mastercored
endif

if BUILD_BITCOIN_CLI
bin_PROGRAMS += bitcoin-cli
bin_PROGRAMS += mastercore-cli
endif

SUBDIRS = . $(BUILD_QT) $(BUILD_TEST)
Expand Down Expand Up @@ -158,35 +158,35 @@ nodist_libbitcoin_common_a_SOURCES = $(top_srcdir)/src/obj/build.h
#

# bitcoind binary #
bitcoind_LDADD = \
mastercored_LDADD = \
libbitcoin_server.a \
libbitcoin_cli.a \
libbitcoin_common.a \
$(LIBLEVELDB) \
$(LIBMEMENV)
if ENABLE_WALLET
bitcoind_LDADD += libbitcoin_wallet.a
mastercored_LDADD += libbitcoin_wallet.a
endif
bitcoind_SOURCES = bitcoind.cpp
mastercored_SOURCES = bitcoind.cpp
#

if TARGET_WINDOWS
bitcoind_SOURCES += bitcoind-res.rc
mastercored_SOURCES += bitcoind-res.rc
endif

AM_CPPFLAGS += $(BDB_CPPFLAGS)
bitcoind_LDADD += $(BOOST_LIBS) $(BDB_LIBS)
mastercored_LDADD += $(BOOST_LIBS) $(BDB_LIBS)

# bitcoin-cli binary #
bitcoin_cli_LDADD = \
mastercore_cli_LDADD = \
libbitcoin_cli.a \
libbitcoin_common.a \
$(BOOST_LIBS)
bitcoin_cli_SOURCES = bitcoin-cli.cpp
mastercore_cli_SOURCES = bitcoin-cli.cpp
#

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

# NOTE: This dependency is not strictly necessary, but without it make may try to build both in parallel, which breaks the LevelDB build system in a race
Expand Down
18 changes: 9 additions & 9 deletions src/qt/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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 = mastercore-qt
noinst_LIBRARIES = libbitcoinqt.a
SUBDIRS = . $(BUILD_TEST_QT)
DIST_SUBDIRS = . test
Expand Down Expand Up @@ -349,22 +349,22 @@ $(QT_MOC): $(PROTOBUF_H)
$(QT_MOC_CPP): $(PROTOBUF_H)

# bitcoin-qt binary #
bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) \
mastercore_qt_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) \
-I$(top_srcdir)/src/qt/forms
bitcoin_qt_SOURCES = bitcoin.cpp
mastercore_qt_SOURCES = bitcoin.cpp
if TARGET_DARWIN
bitcoin_qt_SOURCES += $(BITCOIN_MM)
mastercore_qt_SOURCES += $(BITCOIN_MM)
endif
if TARGET_WINDOWS
bitcoin_qt_SOURCES += $(BITCOIN_RC)
mastercore_qt_SOURCES += $(BITCOIN_RC)
endif
bitcoin_qt_LDADD = libbitcoinqt.a $(LIBBITCOIN_SERVER)
mastercore_qt_LDADD = libbitcoinqt.a $(LIBBITCOIN_SERVER)
if ENABLE_WALLET
bitcoin_qt_LDADD += $(LIBBITCOIN_WALLET)
mastercore_qt_LDADD += $(LIBBITCOIN_WALLET)
endif
bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBLEVELDB) $(LIBMEMENV) \
mastercore_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)
mastercore_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))))
Expand Down

0 comments on commit ba5559c

Please sign in to comment.