[WIP] Update makefiles