Replace _ADD_LIBRARY calls with the real call

Issue #157