Makefile robustification