X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=client%2FMakefile.am;h=4a40dd59e7e55bb22ea2dcf1f9bf2f2f6dfccd4d;hb=df8e6c1a312cfc928aede6fc5eb0efa39364cfa6;hp=1a26fd3462c2dc7a88184b27ae3556e0541acd44;hpb=327abf4adcf732bcc8818f9b35ba366db6085d2a;p=yaz-moved-to-github.git

diff --git a/client/Makefile.am b/client/Makefile.am
index 1a26fd3..4a40dd5 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -1,23 +1,23 @@
-## Copyright (C) 1995-2003, Index Data
+## Copyright (C) 1995-2004, Index Data
 ## All rights reserved.
-## $Id: Makefile.am,v 1.19 2003-03-11 11:07:47 adam Exp $
+## $Id: Makefile.am,v 1.26 2005-09-09 10:34:09 adam Exp $
 
-if ISSSL
-extra=yaz-client-ssl
-endif
 
-bin_PROGRAMS=yaz-client $(extra)
+bin_PROGRAMS=yaz-client 
 EXTRA_PROGRAMS=bertorture
 
 EXTRA_DIST = default.bib
 
-yaz_client_SOURCES=client.c admin.c admin.h tabcomplete.c tabcomplete.h
-yaz_client_ssl_SOURCES=$(yaz_client_SOURCES)
+COMMON=admin.c admin.h tabcomplete.c tabcomplete.h
+yaz_client_SOURCES=client.c $(COMMON)
 
-yaz_client_LDADD = ../lib/libyaz.la $(READLINE_LIBS)
-yaz_client_ssl_LDADD = ../lib/libyazssl.la ../lib/libyaz.la $(READLINE_LIBS) $(SSL_LIBS)
-bertorture_LDADD = ../lib/libyaz.la
+AM_CFLAGS=$(THREAD_CFLAGS)
+
+AM_CPPFLAGS=-I$(top_srcdir)/include $(SSL_CFLAGS)
+
+yaz_client_LDADD = ../src/libyaz.la $(READLINE_LIBS) 
+bertorture_LDADD = ../src/libyaz.la 
 
 bertorture_SOURCES=bertorture.c
 
-AM_CPPFLAGS=-I$(top_srcdir)/include
+