Made makefile more friendly again