More robust Makefile