updating boost.m4
updating make.inc to work with .cpp files
Merge branch 'boyceg/update-make-inc' into next