Changed makefile order