Forgot to add Makefile.am
Fixing some problems in Makefile.am

- Removing CXXFLAGS
- _CPPFLAGS = CORE_CPPFLAGS
Merge pull request #1148 from cduclos/cf-update

Forgot to add Makefile.am