Cleanup and standardize omnibus-software definitions

pull this out afterwards and set `env['XCFLAGS'] = env['CFLAGS']`