Reordering the Makefile to actually work