Revert "Makefile optimizations"

This reverts commit c2e4d68509972b9907f5807e17214ecd9ab734b6.