Align all of these definitions with the latest version of the sparky makefile.  I think a bunch of this got cleaned up in the last iteration of the makefiles.  I would suggest starting from a new copy of the sparky makefile and modifying this one from that point.