Fix tools/Makefile for more tool directories