-Made makefile a bit more flexible