Update Makefile to include Makefile.cmake