(Building now) Fix makefiles.