fix minor issue and do some cleanup work in genericmake example

2016-10-14, Andrey Skvortsov