Fix makefiles so (hopefully) build passes