Fixed Makefile ordering