Revert "a bit more makefile changes"

This reverts commit ae29d5c9e24d58abcbeecfdc279a5e131d7dced7.