Skip to content

Commit

Permalink
Revert "Merge bitcoin#12870: make clean removes src/qt/moc_ files"
Browse files Browse the repository at this point in the history
As noted by theuni and Sjors in bitcoin#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, then add that file to QT_MOC_CPP.

This reverts commit 1d54004, reversing
changes made to ad960f5.
  • Loading branch information
Empact committed May 17, 2018
1 parent 4cfe17c commit 4138f42
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 4138f42

Please sign in to comment.