Rebase of EKR's patches for tracing and frame size with makefile updates.

Updated both the new and old make systems.