Unified makefile.
Cleaning up makefile