Get makefile stuff working right