Paul Green's changes to add $(EXEEXT) and $(CPPFLAGS) as appropriate.