More makefile fiddling