Makefile sections rearranged.