Update Makefiles for new automake