better style rules in makefile
merge