Straightened out makefile