Update makefiles for automake 1.13

Update makefiles for automake 1.13