Second attempt to fix makefile