Makefile Makefile.in merge