-## $Id: Makefile.am,v 1.16 2003-10-06 19:32:03 adam Exp $
+## $Id: Makefile.am,v 1.31 2006-03-29 13:14:15 adam Exp $
-AM_CXXFLAGS = $(YAZINC) -I$(srcdir)/../include $(XML2_CFLAGS)
+check_PROGRAMS = tstquery
+noinst_PROGRAMS = yaz-my-server yaz-my-client
+bin_SCRIPTS = yazpp-config
+
+TESTS = $(check_PROGRAMS)
+
+AM_CXXFLAGS = -I$(srcdir)/../include $(YAZINC)
-noinst_LTLIBRARIES = libyazcpp.la
+lib_LTLIBRARIES = libyazpp.la
+libyazpp_la_LDFLAGS=-version-info 1:0:0
-libyazcpp_la_SOURCES=yaz-socket-manager.cpp yaz-pdu-assoc.cpp \
- yaz-z-assoc.cpp yaz-proxy.cpp yaz-z-query.cpp yaz-ir-assoc.cpp \
+DISTCLEANFILES = yaz++-config
+
+libyazpp_la_SOURCES=socket-observer.cpp pdu-observer.cpp query.cpp \
+ z-server.cpp \
+ yaz-socket-manager.cpp yaz-pdu-assoc.cpp \
+ yaz-z-assoc.cpp yaz-z-query.cpp yaz-ir-assoc.cpp \
yaz-z-server.cpp yaz-pdu-assoc-thread.cpp yaz-z-server-sr.cpp \
yaz-z-server-ill.cpp yaz-z-server-update.cpp yaz-z-databases.cpp \
- yaz-z-cache.cpp yaz-proxy-config.cpp yaz-bw.cpp
+ yaz-z-cache.cpp yaz-cql2rpn.cpp gdu.cpp gduqueue.cpp
-bin_PROGRAMS = yaz-proxy
-noinst_PROGRAMS = yaz-my-server yaz-my-client
-bin_SCRIPTS = yaz++-config
-EXTRA_DIST = config.xml
yaz_my_client_SOURCES=yaz-my-client.cpp
yaz_my_server_SOURCES=yaz-my-server.cpp yaz-marc-sample.cpp
-yaz_proxy_SOURCES=yaz-proxy-main.cpp
+tstquery_SOURCES=tstquery.cpp
-LDADD=libyazcpp.la $(YAZLALIB)
+LDADD=libyazpp.la $(YAZLALIB)