Actually, I talked to Mathieu and he thought it might be good to get the Makefile changes in while waiting for this pull request, so I've got a version where I modified the source finding, as per my comments, as well as fixed the dependency generation to put the files in the build dir. The dependencies took more fiddling than I first thought but I've got it working correctly now. It's getting really late here though, so I'll push the stuff and create a pull request for it in the morning (CET), I don't currently trust myself to operate git ;)