Revert "more makefile optimizations"

This reverts commit 895f717019457004869fbe5465723ecf01dfc117.