simplify Makefile for publication
license merged with changes to Makefile