More makefile refinements