Makefile adjustments