changed Makefile order