Rearrangement for more complicated makefile