Change makefiles

Hope I didn't break anything.