Some Makefile modifications