Update makefiles to fix automake/autoconf deprecations
Merge remote-tracking branch 'origin/master'