More makefile improvements