Huge Makefile update: almost perfect