Automatic merge from submit-queue

Makefile cleanup

Keep the same style for each PHONY and rule.

cc @thockin