Revise Makefile further

I am not really sure how to do this right :(