Makefile additions