more CFLAGS make fixes