X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2FMakefile.am;h=fca2afc0fc52adf5ce060e43ef9a889eaea1ece8;hb=805b4fdf7b70b0e9b298064f24ceff0c1d38e05b;hp=b2e96e38bbd7657eb7779bc3a54f0f5aa23312f7;hpb=e3133d2f2c580f76c9da2e7621c74a064f0955c9;p=yazpp-moved-to-github.git

diff --git a/src/Makefile.am b/src/Makefile.am
index b2e96e3..fca2afc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,22 +1,33 @@
-## $Id: Makefile.am,v 1.1 2000-10-11 11:58:16 adam Exp $
 
-INCLUDES=$(YAZINC) -I../include
+check_PROGRAMS = test_query test_gdu
+noinst_PROGRAMS = yaz-my-server yaz-my-client
+bin_SCRIPTS = yazpp-config
 
-lib_LTLIBRARIES = libyaz++.la
+TESTS = $(check_PROGRAMS)
 
-libyaz___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 \
-	yaz-z-server.cpp
+AM_CXXFLAGS = -I$(srcdir)/../include $(YAZINC)
 
-libyaz___la_LDFLAGS=-version-info 0:0:0
+lib_LTLIBRARIES = libyazpp.la
+libyazpp_la_LDFLAGS=-version-info 6:0:0
 
-bin_PROGRAMS = yaz-client++ yaz-server++ yaz-proxy
-bin_SCRIPTS = yaz++-config
+DISTCLEANFILES = yazpp-config
 
-yaz_client___SOURCES=yaz-client.cpp
+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-cql2rpn.cpp gdu.cpp gduqueue.cpp \
+	timestat.cpp limit-connect.cpp
 
-yaz_server___SOURCES=yaz-server.cpp
+libyazpp_la_LIBADD = $(YAZLALIB)
 
-yaz_proxy_SOURCES=yaz-proxy-main.cpp
+yaz_my_client_SOURCES=yaz-my-client.cpp
 
-LDADD=libyaz++.la $(YAZLALIB) -lpthread
+yaz_my_server_SOURCES=yaz-my-server.cpp yaz-marc-sample.cpp
+
+test_query_SOURCES=test_query.cpp
+test_gdu_SOURCES=test_gdu.cpp
+
+LDADD=libyazpp.la $(YAZLALIB)