The changes make the Makefile useful for C and C++, so they are combined now