Fix warning with automake 1.14.
Tidy up.
Update for automake 1.14.