Revert "Enhanced Makefile"
Merge pull request #45 from f-list/revert-44-makefile_improvements

Revert "Enhanced Makefile"