Clean up and cpp-output preservation in Makefile