More cleanup of the automake files.
Resync with trunk