updated to use common Makefile