More cleanup of the automake files.