[Makefile] more fixes and different style
Merge pull request #49 from darealshinji/patch-1

[Makefile] more fixes and different style