Reorderd Makefile bootstrapping