More Makefile adjustments.