Improved makefile template