Pimped some of the makefiles