Skip to content

Commit 092b366

Browse files
author
MarcoFalke
committed
Merge #13254: Remove improper qt/moc_* cleaning glob from the general Makefile
4138f42 Revert "Merge #12870: make clean removes src/qt/moc_ files" (Ben Woosley) Pull request description: As noted by theuni and Sjors in #12870, qt moc cleaning is handled by CLEAN_QT via QT_MOC_CPP in Makefile.qt.include. In my testing I configured, built and cleaned with qt4 and qt5 both, absent the associated wildcard, and no MOC files were left after clean. Propose we revert the change and reconsider if a specific file is identified, and in that case add that file to QT_MOC_CPP. This reverts commit 1d54004, reversing changes made to ad960f5. Tree-SHA512: 5d5d07733b273e6d1f6cc6634e9bfab3d8ebbe2131ed9b80dafd73d22b4f99d13babf146023703d1cd6471d1d576305ba3ab6a75e6578c79f3caa3e76b407e7f
2 parents 6738813 + 4138f42 commit 092b366

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Makefile.am

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,5 +294,6 @@ clean-docs:
294294
rm -rf doc/doxygen
295295

296296
clean-local: clean-docs
297-
rm -rf coverage_percent.txt test_bitcoin.coverage/ total.coverage/ test/tmp/ cache/ $(OSX_APP) src/qt/moc_*
297+
rm -rf coverage_percent.txt test_bitcoin.coverage/ total.coverage/ test/tmp/ cache/ $(OSX_APP)
298298
rm -rf test/functional/__pycache__ test/functional/test_framework/__pycache__ test/cache
299+

0 commit comments

Comments
 (0)