Revert "Cleaned up makefile"

This reverts commit c332af9b4b6a4243f810839e43a9dd3936cf527b.