Improve configurability of makefile