revamp Makefile