Better makefile config