makefile; libs moved