makefile improvements, regex parsing in icemap