updated makefile structure