Makefile enhancement