remove empty lib-lines
use util directory basename as the util name
fix 'make clean' to actually work (and also fix a typo in previous)