Update Makefile.am's; remove slib import