Adjusted make file.
Tweak makefile, removed Makefile~