The Makefile needs a cleanup as we already have repetition. Should either be converted to use cmake or have some wildcard to reduce repetition.