Fix possible memory corruption when creating Makefile
Fix parallel build
Regenerate charmonizer.c