Minor cosmetic changes in the Makefile.

Properly separate CFLAGS from CPPFLAGS for our always-set extra stuff.