Replace the overall Makefile with one that's a bit easier to understand