Updated makefile to use correct CPPFLAGS.