Skip to content

Commit 5a407bd

Browse files
laanwjlaanwj
committed
makefile.am: split long lines into one file per line
This makes it easier to read diffs. Cosmetic change to build system only.
1 parent 061aff4 commit 5a407bd

File tree

4 files changed

+250
-74
lines changed

4 files changed

+250
-74
lines changed

‎src/Makefile.am

Lines changed: 65 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ include Makefile.include
33
AM_CPPFLAGS += -I$(top_srcdir)/src/leveldb/helpers/memenv \
44
-I$(builddir)
55

6-
noinst_LIBRARIES = libbitcoin_server.a libbitcoin_common.a libbitcoin_cli.a
6+
noinst_LIBRARIES = \
7+
libbitcoin_server.a \
8+
libbitcoin_common.a \
9+
libbitcoin_cli.a
710
if ENABLE_WALLET
811
noinst_LIBRARIES += libbitcoin_wallet.a
912
endif
@@ -14,20 +17,60 @@ SUBDIRS = . $(BUILD_QT) $(BUILD_TEST)
1417
DIST_SUBDIRS = . qt test
1518
.PHONY: FORCE
1619
# bitcoin core #
17-
BITCOIN_CORE_H = addrman.h alert.h allocators.h base58.h bignum.h \
20+
BITCOIN_CORE_H = \
21+
addrman.h \
22+
alert.h \
23+
allocators.h \
24+
base58.h bignum.h \
25+
bloom.h \
26+
chainparams.h \
27+
checkpoints.h \
28+
checkqueue.h \
29+
clientversion.h \
30+
coincontrol.h \
31+
coins.h \
32+
compat.h \
33+
core.h \
34+
crypter.h \
35+
db.h \
36+
hash.h \
37+
init.h \
38+
key.h \
39+
keystore.h \
40+
leveldbwrapper.h \
41+
limitedmap.h \
42+
main.h \
43+
miner.h \
44+
mruset.h \
45+
netbase.h \
46+
net.h \
47+
noui.h \
48+
protocol.h \
1849
rpcclient.h \
1950
rpcprotocol.h \
2051
rpcserver.h \
21-
bloom.h chainparams.h checkpoints.h checkqueue.h \
22-
clientversion.h coincontrol.h compat.h core.h coins.h crypter.h db.h hash.h init.h \
23-
key.h keystore.h leveldbwrapper.h limitedmap.h main.h miner.h mruset.h \
24-
netbase.h net.h noui.h protocol.h script.h serialize.h sync.h threadsafety.h \
25-
txdb.h txmempool.h ui_interface.h uint256.h util.h version.h walletdb.h wallet.h
26-
27-
JSON_H = json/json_spirit.h json/json_spirit_error_position.h \
28-
json/json_spirit_reader.h json/json_spirit_reader_template.h \
29-
json/json_spirit_stream_reader.h json/json_spirit_utils.h \
30-
json/json_spirit_value.h json/json_spirit_writer.h \
52+
script.h \
53+
serialize.h \
54+
sync.h \
55+
threadsafety.h \
56+
txdb.h \
57+
txmempool.h \
58+
ui_interface.h \
59+
uint256.h \
60+
util.h \
61+
version.h \
62+
walletdb.h \
63+
wallet.h
64+
65+
JSON_H = \
66+
json/json_spirit.h \
67+
json/json_spirit_error_position.h \
68+
json/json_spirit_reader.h \
69+
json/json_spirit_reader_template.h \
70+
json/json_spirit_stream_reader.h \
71+
json/json_spirit_utils.h \
72+
json/json_spirit_value.h \
73+
json/json_spirit_writer.h \
3174
json/json_spirit_writer_template.h
3275

3376
obj/build.h: FORCE
@@ -93,7 +136,12 @@ nodist_libbitcoin_common_a_SOURCES = $(top_srcdir)/src/obj/build.h
93136
#
94137

95138
# bitcoind binary #
96-
bitcoind_LDADD = libbitcoin_server.a libbitcoin_cli.a libbitcoin_common.a leveldb/libleveldb.a leveldb/libmemenv.a
139+
bitcoind_LDADD = \
140+
libbitcoin_server.a \
141+
libbitcoin_cli.a \
142+
libbitcoin_common.a \
143+
leveldb/libleveldb.a \
144+
leveldb/libmemenv.a
97145
if ENABLE_WALLET
98146
bitcoind_LDADD += libbitcoin_wallet.a
99147
endif
@@ -108,7 +156,10 @@ AM_CPPFLAGS += $(BDB_CPPFLAGS)
108156
bitcoind_LDADD += $(BOOST_LIBS) $(BDB_LIBS)
109157

110158
# bitcoin-cli binary #
111-
bitcoin_cli_LDADD = libbitcoin_cli.a libbitcoin_common.a $(BOOST_LIBS)
159+
bitcoin_cli_LDADD = \
160+
libbitcoin_cli.a \
161+
libbitcoin_common.a \
162+
$(BOOST_LIBS)
112163
bitcoin_cli_SOURCES = bitcoin-cli.cpp
113164
#
114165

‎src/qt/Makefile.am

Lines changed: 135 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -74,37 +74,68 @@ QT_TS = \
7474
locale/bitcoin_zh_CN.ts \
7575
locale/bitcoin_zh_TW.ts
7676

77-
QT_FORMS_UI = forms/aboutdialog.ui forms/addressbookpage.ui \
77+
QT_FORMS_UI = \
78+
forms/aboutdialog.ui \
79+
forms/addressbookpage.ui \
7880
forms/askpassphrasedialog.ui \
7981
forms/coincontroldialog.ui \
8082
forms/editaddressdialog.ui \
8183
forms/intro.ui \
8284
forms/openuridialog.ui \
83-
forms/optionsdialog.ui forms/overviewpage.ui forms/receiverequestdialog.ui \
85+
forms/optionsdialog.ui \
86+
forms/overviewpage.ui \
87+
forms/receiverequestdialog.ui \
8488
forms/receivecoinsdialog.ui \
85-
forms/rpcconsole.ui forms/sendcoinsdialog.ui forms/sendcoinsentry.ui \
86-
forms/signverifymessagedialog.ui forms/transactiondescdialog.ui
89+
forms/rpcconsole.ui \
90+
forms/sendcoinsdialog.ui \
91+
forms/sendcoinsentry.ui \
92+
forms/signverifymessagedialog.ui \
93+
forms/transactiondescdialog.ui
8794

88-
QT_MOC_CPP = moc_aboutdialog.cpp moc_addressbookpage.cpp \
89-
moc_addresstablemodel.cpp moc_askpassphrasedialog.cpp \
90-
moc_bitcoinaddressvalidator.cpp moc_bitcoinamountfield.cpp \
91-
moc_bitcoingui.cpp moc_bitcoinunits.cpp moc_clientmodel.cpp \
95+
QT_MOC_CPP = \
96+
moc_aboutdialog.cpp \
97+
moc_addressbookpage.cpp \
98+
moc_addresstablemodel.cpp \
99+
moc_askpassphrasedialog.cpp \
100+
moc_bitcoinaddressvalidator.cpp \
101+
moc_bitcoinamountfield.cpp \
102+
moc_bitcoingui.cpp \
103+
moc_bitcoinunits.cpp \
104+
moc_clientmodel.cpp \
92105
moc_coincontroldialog.cpp \
93106
moc_coincontroltreewidget.cpp \
94-
moc_csvmodelwriter.cpp moc_editaddressdialog.cpp moc_guiutil.cpp \
95-
moc_intro.cpp moc_macdockiconhandler.cpp moc_macnotificationhandler.cpp \
96-
moc_monitoreddatamapper.cpp moc_notificator.cpp \
107+
moc_csvmodelwriter.cpp \
108+
moc_editaddressdialog.cpp \
109+
moc_guiutil.cpp \
110+
moc_intro.cpp \
111+
moc_macdockiconhandler.cpp \
112+
moc_macnotificationhandler.cpp \
113+
moc_monitoreddatamapper.cpp \
114+
moc_notificator.cpp \
97115
moc_openuridialog.cpp \
98116
moc_optionsdialog.cpp \
99-
moc_optionsmodel.cpp moc_overviewpage.cpp moc_paymentserver.cpp \
100-
moc_receiverequestdialog.cpp moc_qvalidatedlineedit.cpp moc_qvaluecombobox.cpp \
117+
moc_optionsmodel.cpp \
118+
moc_overviewpage.cpp \
119+
moc_paymentserver.cpp \
120+
moc_receiverequestdialog.cpp \
121+
moc_qvalidatedlineedit.cpp \
122+
moc_qvaluecombobox.cpp \
101123
moc_receivecoinsdialog.cpp \
102124
moc_recentrequeststablemodel.cpp \
103-
moc_rpcconsole.cpp moc_sendcoinsdialog.cpp moc_sendcoinsentry.cpp \
104-
moc_signverifymessagedialog.cpp moc_splashscreen.cpp moc_trafficgraphwidget.cpp moc_transactiondesc.cpp \
105-
moc_transactiondescdialog.cpp moc_transactionfilterproxy.cpp \
106-
moc_transactiontablemodel.cpp moc_transactionview.cpp moc_walletframe.cpp \
107-
moc_walletmodel.cpp moc_walletview.cpp
125+
moc_rpcconsole.cpp \
126+
moc_sendcoinsdialog.cpp \
127+
moc_sendcoinsentry.cpp \
128+
moc_signverifymessagedialog.cpp \
129+
moc_splashscreen.cpp \
130+
moc_trafficgraphwidget.cpp \
131+
moc_transactiondesc.cpp \
132+
moc_transactiondescdialog.cpp \
133+
moc_transactionfilterproxy.cpp \
134+
moc_transactiontablemodel.cpp \
135+
moc_transactionview.cpp \
136+
moc_walletframe.cpp \
137+
moc_walletmodel.cpp \
138+
moc_walletview.cpp
108139

109140
BITCOIN_MM = macdockiconhandler.mm macnotificationhandler.mm
110141

@@ -117,37 +148,97 @@ PROTOBUF_CC = paymentrequest.pb.cc
117148
PROTOBUF_H = paymentrequest.pb.h
118149
PROTOBUF_PROTO = paymentrequest.proto
119150

120-
BITCOIN_QT_H = aboutdialog.h addressbookpage.h addresstablemodel.h \
121-
askpassphrasedialog.h bitcoinaddressvalidator.h bitcoinamountfield.h \
122-
bitcoingui.h bitcoinunits.h clientmodel.h coincontroldialog.h coincontroltreewidget.h csvmodelwriter.h \
123-
editaddressdialog.h guiconstants.h guiutil.h intro.h macdockiconhandler.h \
124-
macnotificationhandler.h monitoreddatamapper.h notificator.h \
151+
BITCOIN_QT_H = \
152+
aboutdialog.h \
153+
addressbookpage.h \
154+
addresstablemodel.h \
155+
askpassphrasedialog.h \
156+
bitcoinaddressvalidator.h \
157+
bitcoinamountfield.h \
158+
bitcoingui.h \
159+
bitcoinunits.h \
160+
clientmodel.h \
161+
coincontroldialog.h \
162+
coincontroltreewidget.h \
163+
csvmodelwriter.h \
164+
editaddressdialog.h \
165+
guiconstants.h \
166+
guiutil.h \
167+
intro.h \
168+
macdockiconhandler.h \
169+
macnotificationhandler.h \
170+
monitoreddatamapper.h \
171+
notificator.h \
125172
openuridialog.h \
126173
optionsdialog.h \
127-
optionsmodel.h overviewpage.h paymentrequestplus.h paymentserver.h \
174+
optionsmodel.h \
175+
overviewpage.h \
176+
paymentrequestplus.h \
177+
paymentserver.h \
128178
receivecoinsdialog.h \
129179
recentrequeststablemodel.h \
130-
receiverequestdialog.h qvalidatedlineedit.h qvaluecombobox.h rpcconsole.h \
131-
sendcoinsdialog.h sendcoinsentry.h signverifymessagedialog.h splashscreen.h \
132-
trafficgraphwidget.h transactiondescdialog.h transactiondesc.h transactionfilterproxy.h \
133-
transactionrecord.h transactiontablemodel.h transactionview.h walletframe.h \
134-
walletmodel.h walletmodeltransaction.h walletview.h
180+
receiverequestdialog.h \
181+
qvalidatedlineedit.h \
182+
qvaluecombobox.h \
183+
rpcconsole.h \
184+
sendcoinsdialog.h \
185+
sendcoinsentry.h \
186+
signverifymessagedialog.h \
187+
splashscreen.h \
188+
trafficgraphwidget.h \
189+
transactiondescdialog.h \
190+
transactiondesc.h \
191+
transactionfilterproxy.h \
192+
transactionrecord.h \
193+
transactiontablemodel.h \
194+
transactionview.h \
195+
walletframe.h \
196+
walletmodel.h \
197+
walletmodeltransaction.h \
198+
walletview.h
135199

136-
RES_ICONS = res/icons/bitcoin.png res/icons/address-book.png \
137-
res/icons/quit.png res/icons/send.png res/icons/toolbar.png \
138-
res/icons/connect0_16.png res/icons/connect1_16.png \
139-
res/icons/connect2_16.png res/icons/connect3_16.png \
140-
res/icons/connect4_16.png res/icons/transaction0.png \
141-
res/icons/transaction2.png res/icons/clock1.png res/icons/clock2.png \
142-
res/icons/clock3.png res/icons/clock4.png res/icons/clock5.png \
143-
res/icons/configure.png res/icons/receive.png res/icons/editpaste.png \
144-
res/icons/editcopy.png res/icons/add.png res/icons/bitcoin_testnet.png \
145-
res/icons/toolbar_testnet.png res/icons/edit.png res/icons/history.png \
146-
res/icons/overview.png res/icons/export.png res/icons/synced.png \
147-
res/icons/remove.png res/icons/tx_mined.png res/icons/tx_input.png \
148-
res/icons/tx_output.png res/icons/tx_inout.png res/icons/lock_closed.png \
149-
res/icons/lock_open.png res/icons/key.png res/icons/filesave.png \
150-
res/icons/qrcode.png res/icons/debugwindow.png res/icons/bitcoin.ico \
200+
RES_ICONS = \
201+
res/icons/bitcoin.png \
202+
res/icons/address-book.png \
203+
res/icons/quit.png \
204+
res/icons/send.png \
205+
res/icons/toolbar.png \
206+
res/icons/connect0_16.png \
207+
res/icons/connect1_16.png \
208+
res/icons/connect2_16.png \
209+
res/icons/connect3_16.png \
210+
res/icons/connect4_16.png \
211+
res/icons/transaction0.png \
212+
res/icons/transaction2.png \
213+
res/icons/clock1.png \
214+
res/icons/clock2.png \
215+
res/icons/clock3.png \
216+
res/icons/clock4.png \
217+
res/icons/clock5.png \
218+
res/icons/configure.png \
219+
res/icons/receive.png \
220+
res/icons/editpaste.png \
221+
res/icons/editcopy.png \
222+
res/icons/add.png \
223+
res/icons/bitcoin_testnet.png \
224+
res/icons/toolbar_testnet.png \
225+
res/icons/edit.png \
226+
res/icons/history.png \
227+
res/icons/overview.png \
228+
res/icons/export.png \
229+
res/icons/synced.png \
230+
res/icons/remove.png \
231+
res/icons/tx_mined.png \
232+
res/icons/tx_input.png \
233+
res/icons/tx_output.png \
234+
res/icons/tx_inout.png \
235+
res/icons/lock_closed.png \
236+
res/icons/lock_open.png \
237+
res/icons/key.png \
238+
res/icons/filesave.png \
239+
res/icons/qrcode.png \
240+
res/icons/debugwindow.png \
241+
res/icons/bitcoin.ico \
151242
res/icons/bitcoin_testnet.ico
152243

153244
BITCOIN_QT_CPP = \

‎src/qt/test/Makefile.am

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,21 @@ if ENABLE_WALLET
1414
TEST_QT_MOC_CPP += moc_paymentservertests.cpp
1515
endif
1616

17-
TEST_QT_H = uritests.h paymentservertests.h paymentrequestdata.h
17+
TEST_QT_H = \
18+
uritests.h \
19+
paymentservertests.h \
20+
paymentrequestdata.h
1821

1922
BUILT_SOURCES = $(TEST_QT_MOC_CPP)
2023

2124
test_bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) $(QT_TEST_INCLUDES)
22-
test_bitcoin_qt_SOURCES = test_main.cpp uritests.cpp $(TEST_QT_H)
25+
test_bitcoin_qt_SOURCES = \
26+
test_main.cpp \
27+
uritests.cpp \
28+
$(TEST_QT_H)
2329
if ENABLE_WALLET
24-
test_bitcoin_qt_SOURCES += paymentservertests.cpp
30+
test_bitcoin_qt_SOURCES += \
31+
paymentservertests.cpp
2532
endif
2633
nodist_test_bitcoin_qt_SOURCES = $(TEST_QT_MOC_CPP)
2734
test_bitcoin_qt_LDADD = $(LIBBITCOINQT) $(LIBBITCOIN_SERVER)

0 commit comments

Comments
 (0)