fix Makefile.am bugs
Merge pull request #8 from manuzhang/fix_makefile_am_bugs

Fix Makefile.am bugs