Update makefiles

Merged Alexander van Heukelum (TriOpSys) requested to merge updates into master

New location for libraries. Add missing targets.