fixup Makefile .o vs .o2 mixups, add GREGCROSS

harmonize -DP2 for all .o2 targets, fixes all tests