[PATCH 0/6] Assorted makefile cleanups