Revert "Makefile - refactoring"

This reverts commit 9aa9177d2952bc27cca8b86051bb9841cdc1fd25.