rearrange the makefile