More makefile cleanup.