Revert "further improvements for the makefile"

This reverts commit f05b62474b726dee6a131ac66ea891bdce6f0758.