Fixing some redundancy in the CXXFLAGS of the Makefile