X-Git-Url: http://git.indexdata.com/?p=yazproxy-moved-to-github.git;a=blobdiff_plain;f=src%2FMakefile.am;h=1631569c9d15002fc6065ff3d1ba524638b1b0a7;hp=7f36b9b559bc249699946fb66bb088fa73801a70;hb=01b28493004534f08f61d44480b98c1e613fdb88;hpb=2f1a9a4b28ae43c9da9e0740f84048065b2d3bf6

diff --git a/src/Makefile.am b/src/Makefile.am
index 7f36b9b..1631569 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,15 +1,33 @@
-## $Id: Makefile.am,v 1.1 2004-04-11 11:36:46 adam Exp $
-
-AM_CXXFLAGS = $(YAZINC) -I$(srcdir)/../include $(XSLT_CFLAGS)
+AM_CXXFLAGS = -I$(srcdir)/../include $(YAZPPINC) $(USEMARCONINC)
 
 lib_LTLIBRARIES = libyazproxy.la
-libyazproxy_la_LDFLAGS=-version-info 1:0:0
+libyazproxy_la_LDFLAGS=-version-info 2:0:0
+
+libyazproxy_la_SOURCES= yaz-proxy.cpp yaz-proxy-config.cpp yaz-bw.cpp \
+ proxyp.h yaz-usemarcon.cpp charset-converter.cpp msg-thread.cpp msg-thread.h \
+ modules.cpp limit-connect.cpp
+
+bin_PROGRAMS = yazproxy
+check_PROGRAMS = cdetails
+noinst_PROGRAMS = tstthreads t-server
+
+TESTS=$(check_PROGRAMS)
+
+yazproxy_SOURCES=yaz-proxy-main.cpp
+cdetails_SOURCES=cdetails.cpp
+tstthreads_SOURCES=tstthreads.cpp
+t_server_SOURCES=t-server.cpp
+
+libyazproxy_la_LIBADD = $(YAZPPLALIB)
+
+LDADD=libyazproxy.la $(USEMARCONLALIB) $(YAZPPLALIB)
 
-libyazproxy_la_SOURCES= yaz-proxy.cpp yaz-proxy-config.cpp yaz-bw.cpp
+# Modules
+mod_proxy_sample_la_SOURCES = mod_sample.cpp
+mod_proxy_sample_la_LDFLAGS = -rpath $(pkglibdir) -module -avoid-version
 
-bin_PROGRAMS = yaz-proxy
+mod_proxy_helsinki_la_SOURCES = mod_helsinki.cpp
+mod_proxy_helsinki_la_LDFLAGS = -rpath $(pkglibdir) -module -avoid-version
 
-yaz_proxy_SOURCES=yaz-proxy-main.cpp
+pkglib_LTLIBRARIES = mod_proxy_sample.la mod_proxy_helsinki.la
 
-LDADD=libyazproxy.la ../src/libyazcpp.la $(YAZLALIB) $(XSLT_LIBS)
-libyazproxy_la_LIBADD = $(XSLT_LIBS)