Revert "	Additional Makefile optimization"

This reverts commit 3b51811147d01c9be7d60e5b46b1937007b20eb4.