sync Makefile from 2.4.1 to 2.6
use icharstream
basic tests for 2.6.1
ignore depend files
remove trailing semicolon from icharstream.cc

since pedantically it is not necessary