Makefile tweaks
Switch to CMake for compile_commands.json