Improved Makefile dependencies.
Merge pull request #255 from ertes/master

Improved Makefile dependencies