bug 833164 - consolodate the various makeDepend things in the tree r=ted