Fixes to makefile, prepare for more libs