More cleanup of the automake files.
Merge branch 'master' of https://github.com/OpenLightingProject/ola into e1.37-2