merging makefiles
merging makefiles