C++ makefile generator
Merge branch 'makefile_generator'