Clean up rule order in Makefile