Bug 838657 makefile

Makefile with better sytaxe structure