Merged different Makefile versions