completely merged old Makefile