Further reordering in makefile