merging makefiles