rearrange Makefile