C++: updated make files for NB