Improved makefile ...