X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=src%2FMakefile.am;h=6266b94981ac61a86ca3f21f2203d6dceccc1cec;hp=67f1bedc3600073f74f2b05649578cc7f4c17b97;hb=80f76096e4a83eeeb66ea55ef0d526b1f360a10c;hpb=307a8638d6429b0f77ad762d52309c550e45648c

diff --git a/src/Makefile.am b/src/Makefile.am
index 67f1bed..6266b94 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,23 +1,30 @@
-## $Id: Makefile.am,v 1.20 2003-12-16 14:17:01 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 3: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 = yazpp-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-cql2rpn.cpp
-
-bin_PROGRAMS = yaz-proxy
-noinst_PROGRAMS = yaz-my-server yaz-my-client
-bin_SCRIPTS = yaz++-config
+	yaz-z-cache.cpp yaz-cql2rpn.cpp gdu.cpp gduqueue.cpp \
+	timestat.cpp limit-connect.cpp
 
 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)