Makefile makeover