X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=src%2FMakefile.am;h=bbf6145721e4c03f629bc7cd2df305a8018963b0;hp=de9f70c2c9e5ffbf329397951db1297f2c9b158a;hb=a0042915b20e2a1d15efa254c35e22cf09e0796a;hpb=095a4b386f206f362c6cdc1fb0f05ab6442fa6ff

diff --git a/src/Makefile.am b/src/Makefile.am
index de9f70c..bbf6145 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,24 +1,30 @@
-## $Id: Makefile.am,v 1.16 2003-10-06 19:32:03 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-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)