Improve holmakefile