adding AM_CXXFLAGS to Makefile.am
Merge branch 'master' into macosx