Update makefiles for automake 1.13
Merge pull request #15 from dmashal/master

Update makefiles for automake 1.13