Update makefiles
Makefile fixes