fix build issues when in isolation by moving more stuff into make_library
Merge pull request #31 from mikeferguson/groovy-devel

fix build issues when in isolation by moving more stuff into make_libraries