Skip to content

Commit 70c71c5

Browse files
theunitheuni
committed
build: Tidy up file generation output
- Some file generation was still noisy, silence it. - AM_V_GEN is used rather than @ so that 'make V=1' works as intended - Cut down on file copies and moves when using sed, use pipes instead - Avoid the use of top_ and abs_ dirs where possible
1 parent 6b9f0d5 commit 70c71c5

File tree

2 files changed

+20
-24
lines changed

2 files changed

+20
-24
lines changed

‎src/Makefile.am‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -210,16 +210,16 @@ clean-local:
210210
rm -f leveldb/*/*.gcno leveldb/helpers/memenv/*.gcno
211211

212212
.rc.o:
213-
@test -f $(WINDRES) && $(WINDRES) -i $< -o $@ || \
214-
echo error: could not build $@
213+
@test -f $(WINDRES)
214+
$(AM_V_GEN) $(WINDRES) -i $< -o $@
215215

216216
.mm.o:
217-
$(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
217+
$(AM_V_CXX) $(OBJCXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
218218
$(CPPFLAGS) $(AM_CXXFLAGS) $(QT_INCLUDES) $(CXXFLAGS) -c -o $@ $<
219219

220220
%.pb.cc %.pb.h: %.proto
221-
test -f $(PROTOC) && $(PROTOC) --cpp_out=$(@D) --proto_path=$(abspath $(<D) $<) || \
222-
echo error: could not build $@
221+
@test -f $(PROTOC)
222+
$(AM_V_GEN) $(PROTOC) --cpp_out=$(@D) --proto_path=$(abspath $(<D) $<)
223223

224224
LIBBITCOIN_SERVER=libbitcoin_server.a
225225
LIBBITCOIN_WALLET=libbitcoin_wallet.a

‎src/Makefile.qt.include‎

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -365,17 +365,16 @@ QT_QM=$(QT_TS:.ts=.qm)
365365

366366
qt/bitcoinstrings.cpp: $(libbitcoin_server_a_SOURCES) $(libbitcoin_common_a_SOURCES) $(libbitcoin_cli_a_SOURCES)
367367
@test -n $(XGETTEXT) || echo "xgettext is required for updating translations"
368-
@cd $(top_srcdir); XGETTEXT=$(XGETTEXT) share/qt/extract_strings_qt.py
368+
$(AM_V_GEN) cd $(top_srcdir); XGETTEXT=$(XGETTEXT) share/qt/extract_strings_qt.py
369369

370370
translate: qt/bitcoinstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(BITCOIN_MM)
371371
@test -n $(LUPDATE) || echo "lupdate is required for updating translations"
372-
@QT_SELECT=$(QT_SELECT) $(LUPDATE) $^ -locations relative -no-obsolete -ts qt/locale/bitcoin_en.ts
372+
$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(LUPDATE) $^ -locations relative -no-obsolete -ts qt/locale/bitcoin_en.ts
373373

374374
$(QT_QRC_CPP): $(QT_QRC) $(QT_QM) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_MOVIES) $(PROTOBUF_H)
375-
@cd $(abs_srcdir); test -f $(RCC) && QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin -o $(abs_builddir)/$@ $< || \
376-
echo error: could not build $@
377-
$(SED) -e '/^\*\*.*Created:/d' $@ > [email protected] && mv $@{.n,}
378-
$(SED) -e '/^\*\*.*by:/d' $@ > [email protected] && mv $@{.n,}
375+
@test -f $(RCC)
376+
$(AM_V_GEN) cd $(srcdir); QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin $< | \
377+
$(SED) -e '/^\*\*.*Created:/d' -e '/^\*\*.*by:/d' > $(abs_builddir)/$@
379378

380379
CLEAN_QT = $(nodist_qt_libbitcoinqt_a_SOURCES) $(QT_QM) $(QT_FORMS_H) qt/*.gcda qt/*.gcno
381380

@@ -387,22 +386,19 @@ bitcoin_qt_clean: FORCE
387386
bitcoin_qt : qt/bitcoin-qt$(EXEEXT)
388387

389388
ui_%.h: %.ui
390-
@test -d $(abs_builddir)/$(@D) || $(MKDIR_P) $(abs_builddir)/$(@D)
391-
@test -f $(UIC) && QT_SELECT=$(QT_SELECT) $(UIC) -o $(abs_builddir)/$@ $(abs_srcdir)/$< || echo error: could not build $(abs_builddir)/$@
392-
$(SED) -e '/^\*\*.*Created:/d' $(abs_builddir)/$@ > $(abs_builddir)/[email protected] && mv $(abs_builddir)/$@{.n,}
393-
$(SED) -e '/^\*\*.*by:/d' $(abs_builddir)/$@ > $(abs_builddir)/[email protected] && mv $(abs_builddir)/$@{.n,}
389+
@test -f $(UIC)
390+
@$(MKDIR_P) $(@D)
391+
$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(UIC) -o $@ $< || (echo "Error creating $@"; false)
394392

395393
%.moc: %.cpp
396-
QT_SELECT=$(QT_SELECT) $(MOC) $(QT_INCLUDES) $(MOC_DEFS) -o $@ $<
397-
$(SED) -e '/^\*\*.*Created:/d' $@ > [email protected] && mv $@{.n,}
398-
$(SED) -e '/^\*\*.*by:/d' $@ > [email protected] && mv $@{.n,}
394+
$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(MOC) $(QT_INCLUDES) $(MOC_DEFS) $< | \
395+
$(SED) -e '/^\*\*.*Created:/d' -e '/^\*\*.*by:/d' > $@
399396

400397
moc_%.cpp: %.h
401-
QT_SELECT=$(QT_SELECT) $(MOC) $(QT_INCLUDES) $(MOC_DEFS) -o $@ $<
402-
$(SED) -e '/^\*\*.*Created:/d' $@ > [email protected] && mv $@{.n,}
403-
$(SED) -e '/^\*\*.*by:/d' $@ > [email protected] && mv $@{.n,}
398+
$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(MOC) $(QT_INCLUDES) $(MOC_DEFS) $< | \
399+
$(SED) -e '/^\*\*.*Created:/d' -e '/^\*\*.*by:/d' > $@
404400

405401
%.qm: %.ts
406-
@test -d $(abs_builddir)/$(@D) || $(MKDIR_P) $(abs_builddir)/$(@D)
407-
@test -f $(LRELEASE) && QT_SELECT=$(QT_SELECT) $(LRELEASE) $(abs_srcdir)/$< -qm $(abs_builddir)/$@ || \
408-
echo error: could not build $(abs_builddir)/$@
402+
@test -f $(LRELEASE)
403+
@$(MKDIR_P) $(@D)
404+
$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(LRELEASE) -silent $< -qm $@

0 commit comments

Comments
 (0)