[#24981] Merging the make files. Adding dependencies.