Improve configurability of the Makefile