New makefile
Updates to makefile