7043d2b942
This reverts commit f08a2601d7.
Those additional makefiles only duplicate existing cmake functionality and
constantly get out of sync