Cleanup the rest of the Makefile.am's
Merge pull request #1814 from rubenk/makefile-cleanup-part-II

Cleanup the rest of the Makefile.am's