More control on output from top level Makefile

Move the '-k -s' flags to a new FLAGS variable which can then be overridden
on the command line.