Better Makefile rules