Modified makefile to use common lib