Adjust Makefile for C warnings and compiler optimizations

Separate Warnings into separate variable and set optimization flags in
one location

I also see that CPP is being used to refer to c++ rather than the c pre processor, but that is something to worry about during file movement.