cmake compilation fixes
Removed old Makefile

Rely completely on cmake for linux & macosx