Updated makefile (II).
Merge branch 'master' of https://github.com/kraluk/hlex

Conflicts:
	others/makefile