Glad you found out and thanks for sharing your findings !
Thanks for the link, I've forgotten that page.
What I usually do is an out of source build, so when there's something to change, you can just nuke the build folder and start fresh without to worry about what would need to be cleaned from the source tree.
Since you have it working now, please mark the thread as solved using the "Topic Tool" button so that other forum users may know a solution has been found :)