Cleanup makefile

The last few commits clearly messed things up a bit.