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

Update makefiles for automake 1.13