Fixing inter/makefile in all object dirs.
Merge branch 'devel' into coulomb