Some tweaks to Makefile
Add source-location support