changed makefile order