Revert "Optimize Makefile"

This reverts commit fe495533c1ac4a74db1d3e64715cf9d0cff41254.