Tidy up EXTRA_ build flags

Use new EXTRA_CPPFLAGS in Github CI
Harmonise use of:
  EXTRA_CPPFLAGS
  EXTRA_CFLAGS
  EXTRA_CXXFLAGS
  EXTRA_LDFLAGS
6 files changed