Update Makefile

It was a mess.