Taking the generated makefiles which should never have been in the commit tree
Removing package location dependencies; using pkgconfig