build: make cstyle should be done automatically

Also fix a cstyle bug that apparently crept in.