changes to makefile.in and configure.in - support of speciying location of sony and handera files, clean calc-dia directory