Hi!
I think that there must be an option to constantly update the makefiles so each time you save a project the makefiles gets updated.
This will resolve the out-of-sync problem of the C::B makefile in CVS.
Putting an "Auto-export makefile when saving the project" checkbox in menu
Project->Properties would be good.
And of course, have the option turned ON by default on CodeBlocks-xx.cbp