Skip to content

Commit 4ea7903

Browse files
UdjinM6UdjinM6
authored
Dashify lib names (#2035)
1 parent 4148b82 commit 4ea7903

File tree

2 files changed

+49
-49
lines changed

2 files changed

+49
-49
lines changed

‎src/Makefile.am‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,23 @@ BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BDB_CPPFLAGS) $(BOOST_CPPFLAG
2525
BITCOIN_INCLUDES += -I$(srcdir)/secp256k1/include
2626
BITCOIN_INCLUDES += $(UNIVALUE_CFLAGS)
2727

28-
LIBBITCOIN_SERVER=libbitcoin_server.a
29-
LIBBITCOIN_COMMON=libbitcoin_common.a
30-
LIBBITCOIN_CONSENSUS=libbitcoin_consensus.a
31-
LIBBITCOIN_CLI=libbitcoin_cli.a
32-
LIBBITCOIN_UTIL=libbitcoin_util.a
33-
LIBBITCOIN_CRYPTO=crypto/libbitcoin_crypto.a
34-
LIBBITCOINQT=qt/libbitcoinqt.a
28+
LIBBITCOIN_SERVER=libdash_server.a
29+
LIBBITCOIN_COMMON=libdash_common.a
30+
LIBBITCOIN_CONSENSUS=libdash_consensus.a
31+
LIBBITCOIN_CLI=libdash_cli.a
32+
LIBBITCOIN_UTIL=libdash_util.a
33+
LIBBITCOIN_CRYPTO=crypto/libdash_crypto.a
34+
LIBBITCOINQT=qt/libdashqt.a
3535
LIBSECP256K1=secp256k1/libsecp256k1.la
3636

3737
if ENABLE_ZMQ
38-
LIBBITCOIN_ZMQ=libbitcoin_zmq.a
38+
LIBBITCOIN_ZMQ=libdash_zmq.a
3939
endif
4040
if BUILD_BITCOIN_LIBS
4141
LIBBITCOINCONSENSUS=libdashconsensus.la
4242
endif
4343
if ENABLE_WALLET
44-
LIBBITCOIN_WALLET=libbitcoin_wallet.a
44+
LIBBITCOIN_WALLET=libdash_wallet.a
4545
endif
4646

4747
$(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*)
@@ -201,12 +201,12 @@ obj/build.h: FORCE
201201
@$(MKDIR_P) $(builddir)/obj
202202
@$(top_srcdir)/share/genbuild.sh $(abs_top_builddir)/src/obj/build.h \
203203
$(abs_top_srcdir)
204-
libbitcoin_util_a-clientversion.$(OBJEXT): obj/build.h
204+
libdash_util_a-clientversion.$(OBJEXT): obj/build.h
205205

206206
# server: shared between dashd and dash-qt
207-
libbitcoin_server_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(MINIUPNPC_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS)
208-
libbitcoin_server_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
209-
libbitcoin_server_a_SOURCES = \
207+
libdash_server_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(MINIUPNPC_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS)
208+
libdash_server_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
209+
libdash_server_a_SOURCES = \
210210
activemasternode.cpp \
211211
addrman.cpp \
212212
addrdb.cpp \
@@ -268,9 +268,9 @@ libbitcoin_server_a_SOURCES = \
268268
$(BITCOIN_CORE_H)
269269

270270
if ENABLE_ZMQ
271-
libbitcoin_zmq_a_CPPFLAGS = $(BITCOIN_INCLUDES) $(ZMQ_CFLAGS)
272-
libbitcoin_zmq_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
273-
libbitcoin_zmq_a_SOURCES = \
271+
libdash_zmq_a_CPPFLAGS = $(BITCOIN_INCLUDES) $(ZMQ_CFLAGS)
272+
libdash_zmq_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
273+
libdash_zmq_a_SOURCES = \
274274
zmq/zmqabstractnotifier.cpp \
275275
zmq/zmqnotificationinterface.cpp \
276276
zmq/zmqpublishnotifier.cpp
@@ -279,9 +279,9 @@ endif
279279

280280
# wallet: shared between dashd and dash-qt, but only linked
281281
# when wallet enabled
282-
libbitcoin_wallet_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
283-
libbitcoin_wallet_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
284-
libbitcoin_wallet_a_SOURCES = \
282+
libdash_wallet_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
283+
libdash_wallet_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
284+
libdash_wallet_a_SOURCES = \
285285
keepass.cpp \
286286
privatesend-client.cpp \
287287
privatesend-util.cpp \
@@ -295,9 +295,9 @@ libbitcoin_wallet_a_SOURCES = \
295295
$(BITCOIN_CORE_H)
296296

297297
# crypto primitives library
298-
crypto_libbitcoin_crypto_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_CONFIG_INCLUDES) $(PIC_FLAGS)
299-
crypto_libbitcoin_crypto_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) $(PIC_FLAGS)
300-
crypto_libbitcoin_crypto_a_SOURCES = \
298+
crypto_libdash_crypto_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_CONFIG_INCLUDES) $(PIC_FLAGS)
299+
crypto_libdash_crypto_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) $(PIC_FLAGS)
300+
crypto_libdash_crypto_a_SOURCES = \
301301
crypto/aes.cpp \
302302
crypto/aes.h \
303303
crypto/common.h \
@@ -316,7 +316,7 @@ crypto_libbitcoin_crypto_a_SOURCES = \
316316
crypto/sha512.h
317317

318318
# x11
319-
crypto_libbitcoin_crypto_a_SOURCES += \
319+
crypto_libdash_crypto_a_SOURCES += \
320320
crypto/blake.c \
321321
crypto/bmw.c \
322322
crypto/cubehash.c \
@@ -342,9 +342,9 @@ crypto_libbitcoin_crypto_a_SOURCES += \
342342
crypto/sph_types.h
343343

344344
# consensus: shared between all executables that validate any consensus rules.
345-
libbitcoin_consensus_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
346-
libbitcoin_consensus_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
347-
libbitcoin_consensus_a_SOURCES = \
345+
libdash_consensus_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
346+
libdash_consensus_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
347+
libdash_consensus_a_SOURCES = \
348348
amount.h \
349349
arith_uint256.cpp \
350350
arith_uint256.h \
@@ -377,9 +377,9 @@ libbitcoin_consensus_a_SOURCES = \
377377
version.h
378378

379379
# common: shared between dashd, and dash-qt and non-server tools
380-
libbitcoin_common_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
381-
libbitcoin_common_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
382-
libbitcoin_common_a_SOURCES = \
380+
libdash_common_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
381+
libdash_common_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
382+
libdash_common_a_SOURCES = \
383383
amount.cpp \
384384
base58.cpp \
385385
bip39.cpp \
@@ -403,9 +403,9 @@ libbitcoin_common_a_SOURCES = \
403403
# util: shared between all executables.
404404
# This library *must* be included to make sure that the glibc
405405
# backward-compatibility objects and their sanity checks are linked.
406-
libbitcoin_util_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
407-
libbitcoin_util_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
408-
libbitcoin_util_a_SOURCES = \
406+
libdash_util_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
407+
libdash_util_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
408+
libdash_util_a_SOURCES = \
409409
support/lockedpool.cpp \
410410
chainparamsbase.cpp \
411411
clientversion.cpp \
@@ -424,20 +424,20 @@ libbitcoin_util_a_SOURCES = \
424424
$(BITCOIN_CORE_H)
425425

426426
if GLIBC_BACK_COMPAT
427-
libbitcoin_util_a_SOURCES += compat/glibc_compat.cpp
427+
libdash_util_a_SOURCES += compat/glibc_compat.cpp
428428
endif
429429

430430
# cli: shared between dash-cli and dash-qt
431-
libbitcoin_cli_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
432-
libbitcoin_cli_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
433-
libbitcoin_cli_a_SOURCES = \
431+
libdash_cli_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
432+
libdash_cli_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
433+
libdash_cli_a_SOURCES = \
434434
rpc/client.cpp \
435435
$(BITCOIN_CORE_H)
436436

437-
nodist_libbitcoin_util_a_SOURCES = $(srcdir)/obj/build.h
437+
nodist_libdash_util_a_SOURCES = $(srcdir)/obj/build.h
438438
#
439439

440-
# bitcoind binary #
440+
# dashd binary #
441441
dashd_SOURCES = dashd.cpp
442442
dashd_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
443443
dashd_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
@@ -504,7 +504,7 @@ dash_tx_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS)
504504
# dashconsensus library #
505505
if BUILD_BITCOIN_LIBS
506506
include_HEADERS = script/dashconsensus.h
507-
libdashconsensus_la_SOURCES = $(crypto_libbitcoin_crypto_a_SOURCES) $(libbitcoin_consensus_a_SOURCES)
507+
libdashconsensus_la_SOURCES = $(crypto_libdash_crypto_a_SOURCES) $(libdash_consensus_a_SOURCES)
508508

509509
if GLIBC_BACK_COMPAT
510510
libdashconsensus_la_SOURCES += compat/glibc_compat.cpp

‎src/Makefile.qt.include‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
55

66
bin_PROGRAMS += qt/dash-qt
7-
EXTRA_LIBRARIES += qt/libbitcoinqt.a
7+
EXTRA_LIBRARIES += qt/libdashqt.a
88

99
# dash qt core #
1010
QT_TS = \
@@ -530,14 +530,14 @@ BITCOIN_RC = qt/res/dash-qt-res.rc
530530
BITCOIN_QT_INCLUDES = -I$(builddir)/qt -I$(srcdir)/qt -I$(srcdir)/qt/forms \
531531
-I$(builddir)/qt/forms -DQT_NO_KEYWORDS
532532

533-
qt_libbitcoinqt_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \
533+
qt_libdashqt_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \
534534
$(QT_INCLUDES) $(QT_DBUS_INCLUDES) $(PROTOBUF_CFLAGS) $(QR_CFLAGS)
535-
qt_libbitcoinqt_a_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS)
535+
qt_libdashqt_a_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS)
536536

537-
qt_libbitcoinqt_a_SOURCES = $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(QT_FORMS_UI) \
537+
qt_libdashqt_a_SOURCES = $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(QT_FORMS_UI) \
538538
$(QT_QRC) $(QT_QRC_LOCALE) $(QT_TS) $(PROTOBUF_PROTO) $(RES_ICONS) $(RES_IMAGES) $(RES_CSS) $(RES_MOVIES)
539539

540-
nodist_qt_libbitcoinqt_a_SOURCES = $(QT_MOC_CPP) $(QT_MOC) $(PROTOBUF_CC) \
540+
nodist_qt_libdashqt_a_SOURCES = $(QT_MOC_CPP) $(QT_MOC) $(PROTOBUF_CC) \
541541
$(PROTOBUF_H) $(QT_QRC_CPP) $(QT_QRC_LOCALE_CPP)
542542

543543
# forms/foo.h -> forms/ui_foo.h
@@ -546,7 +546,7 @@ QT_FORMS_H=$(join $(dir $(QT_FORMS_UI)),$(addprefix ui_, $(notdir $(QT_FORMS_UI:
546546
# Most files will depend on the forms and moc files as includes. Generate them
547547
# before anything else.
548548
$(QT_MOC): $(QT_FORMS_H)
549-
$(qt_libbitcoinqt_a_OBJECTS) $(qt_dash_qt_OBJECTS) : | $(QT_MOC)
549+
$(qt_libdashqt_a_OBJECTS) $(qt_dash_qt_OBJECTS) : | $(QT_MOC)
550550

551551
#Generating these with a half-written protobuf header leads to wacky results.
552552
#This makes sure it's done.
@@ -565,7 +565,7 @@ endif
565565
if TARGET_WINDOWS
566566
qt_dash_qt_SOURCES += $(BITCOIN_RC)
567567
endif
568-
qt_dash_qt_LDADD = qt/libbitcoinqt.a $(LIBBITCOIN_SERVER)
568+
qt_dash_qt_LDADD = qt/libdashqt.a $(LIBBITCOIN_SERVER)
569569
if ENABLE_WALLET
570570
qt_dash_qt_LDADD += $(LIBBITCOIN_WALLET)
571571
endif
@@ -583,7 +583,7 @@ QT_QM=$(QT_TS:.ts=.qm)
583583

584584
SECONDARY: $(QT_QM)
585585

586-
$(srcdir)/qt/dashstrings.cpp: $(libbitcoin_server_a_SOURCES) $(libbitcoin_wallet_a_SOURCES) $(libbitcoin_common_a_SOURCES) $(libbitcoin_zmq_a_SOURCES) $(libbitcoin_consensus_a_SOURCES) $(libbitcoin_util_a_SOURCES)
586+
$(srcdir)/qt/dashstrings.cpp: $(libdash_server_a_SOURCES) $(libdash_wallet_a_SOURCES) $(libdash_common_a_SOURCES) $(libdash_zmq_a_SOURCES) $(libdash_consensus_a_SOURCES) $(libdash_util_a_SOURCES)
587587
@test -n $(XGETTEXT) || echo "xgettext is required for updating translations"
588588
$(AM_V_GEN) cd $(srcdir); XGETTEXT=$(XGETTEXT) PACKAGE_NAME="$(PACKAGE_NAME)" COPYRIGHT_HOLDERS="$(COPYRIGHT_HOLDERS)" COPYRIGHT_HOLDERS_SUBSTITUTION="$(COPYRIGHT_HOLDERS_SUBSTITUTION)" $(PYTHON) ../share/qt/extract_strings_qt.py $^
589589

@@ -603,12 +603,12 @@ $(QT_QRC_CPP): $(QT_QRC) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_CSS) $(R
603603
$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) $(RCCFLAGS) -name dash $< | \
604604
$(SED) -e '/^\*\*.*Created:/d' -e '/^\*\*.*by:/d' > $@
605605

606-
CLEAN_QT = $(nodist_qt_libbitcoinqt_a_SOURCES) $(QT_QM) $(QT_FORMS_H) qt/*.gcda qt/*.gcno
606+
CLEAN_QT = $(nodist_qt_libdashqt_a_SOURCES) $(QT_QM) $(QT_FORMS_H) qt/*.gcda qt/*.gcno
607607

608608
CLEANFILES += $(CLEAN_QT)
609609

610610
dash_qt_clean: FORCE
611-
rm -f $(CLEAN_QT) $(qt_libbitcoinqt_a_OBJECTS) $(qt_dash_qt_OBJECTS) qt/dash-qt$(EXEEXT) $(LIBBITCOINQT)
611+
rm -f $(CLEAN_QT) $(qt_libdashqt_a_OBJECTS) $(qt_dash_qt_OBJECTS) qt/dash-qt$(EXEEXT) $(LIBBITCOINQT)
612612

613613
dash_qt : qt/dash-qt$(EXEEXT)
614614

0 commit comments

Comments
 (0)