Bug 1038247 - Simplify Makefile

This cuts the Makefile down from 15 targets to 8. Having fewer targets, it is much easier to grok and hopefully manage.