Synchronize Makefile's.

Not changing them to symlinks so that I can easily copy out of the
git repo.