better makefile handling