-INCLUDES = -I$(srcdir)/../include @YAZINC@
-LDADD = libdict.a ../bfile/libbfile.a ../dfa/libdfa.a ../util/libutil.a @YAZLIB@ @LIBS@
+AM_CPPFLAGS = -I$(srcdir)/../include $(YAZINC)
+
+LDADD = libdict.a ../bfile/libbfile.a ../dfa/libdfa.a ../util/libutil.a $(YAZLIB) $(TCL_LIB)