aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Schnelli <dev@jonasschnelli.ch>2018-04-04 14:44:55 +0300
committerJonas Schnelli <dev@jonasschnelli.ch>2018-04-04 14:45:06 +0300
commit1d540046fe47eb7b6062c55ebebd801ece96231c (patch)
tree6ff42b0f5d25bbe29b24fa8bfce40c2eeedf1b18
parentad960f5771dc251c8e1198dd8a82e18df4562171 (diff)
parent2ebad11cf9ec925e4ad75f4520f40b57df4233e5 (diff)
Merge #12870: make clean removes src/qt/moc_ files
2ebad11cf make clean removes src/qt/moc_ files (Sjors Provoost) Pull request description: Prevents build errors when making e.g. the following switch: ```sh ./configure make make clean ./configure --with-gui=qt4 make ``` Tree-SHA512: ec725dd6513e8d69398a4994f4b12a47f4e30401f421f8db7e398fca91b0f81bf9e4c566a23a37f229959f761daf6827a6d889f3b43faa05386ca083a8e392d7
-rw-r--r--Makefile.am3
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index f345760f2d..f554501b2e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -293,6 +293,5 @@ 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)
+ rm -rf coverage_percent.txt test_bitcoin.coverage/ total.coverage/ test/tmp/ cache/ $(OSX_APP) src/qt/moc_*
rm -rf test/functional/__pycache__ test/functional/test_framework/__pycache__ test/cache
-