Revert "Simplifying makefile"
Revert "Simplifying makefile"

This reverts commit b37f475277a2766d4c8c4ecb83125ba0de1e22d9.

rafecolton/docker-builder,winchman/builder-core,rafecolton/docker-builder,rafecolton/docker-builder