r10049: improve makefile