diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2018-05-21 12:39:42 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2018-05-21 12:39:51 -0400 |
| commit | 092b366881427b3ba3c285a3922c012016545903 (patch) | |
| tree | d0bb4d0df4aea0b73ae58c0f86d71bc7a249c484 | |
| parent | 6738813bcbb730b5a19e67482b6612d568c22699 (diff) | |
| parent | 4138f42d24ae98da5816a7cce887a54c4550b6da (diff) | |
| download | bitcoin-092b366881427b3ba3c285a3922c012016545903.tar.xz | |
Merge #13254: Remove improper qt/moc_* cleaning glob from the general Makefile
4138f42d24 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 1d540046fe47eb7b6062c55ebebd801ece96231c, reversing
changes made to ad960f5771dc251c8e1198dd8a82e18df4562171.
Tree-SHA512: 5d5d07733b273e6d1f6cc6634e9bfab3d8ebbe2131ed9b80dafd73d22b4f99d13babf146023703d1cd6471d1d576305ba3ab6a75e6578c79f3caa3e76b407e7f
| -rw-r--r-- | Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 8a8debb079..0ed3dd289a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -294,5 +294,6 @@ clean-docs: rm -rf doc/doxygen clean-local: clean-docs - rm -rf coverage_percent.txt test_bitcoin.coverage/ total.coverage/ test/tmp/ cache/ $(OSX_APP) src/qt/moc_* + rm -rf coverage_percent.txt test_bitcoin.coverage/ total.coverage/ test/tmp/ cache/ $(OSX_APP) rm -rf test/functional/__pycache__ test/functional/test_framework/__pycache__ test/cache + |