More makefile cleanups