Improved makefile, slightly more flexible.