Changed order.
Changed makefile command.