rearrange makefile parts