-yaz_client_LDADD = ../lib/libyaz.la $(READLINE_LIBS)
-yaz_client_ssl_LDADD = ../lib/libyazssl.la ../lib/libyaz.la $(READLINE_LIBS) $(SSL_LIBS)
-bertorture_LDADD = ../lib/libyaz.la
+AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS) $(SSL_CFLAGS)
+
+yaz_client_LDADD = ../src/libyaz.la $(READLINE_LIBS)
+bertorture_LDADD = ../src/libyaz.la