fix preprocess jamfile for modularization
Merge branch 'develop'