merging makefiles first pass