Clean up Makefile

Remove *-sol thingy and declare clean .PHONY