Small code structure modification

There were two Makefile templates before, one for C and the other for
C++. In this commitment, only the one for C++ is kept. For the Makefile
for C, I use keyword replacement to accomplish it.