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

diff --git a/client/Makefile.am b/client/Makefile.am
index 1a26fd3..7ed3a24 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -1,23 +1,19 @@
-## 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.22 2004-04-28 22:44:58 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
+yaz_client_LDADD = ../src/libyaz.la $(READLINE_LIBS) $(SSL_LIBS)
+bertorture_LDADD = ../src/libyaz.la $(SSL_LIBS)
 
 bertorture_SOURCES=bertorture.c
 
-AM_CPPFLAGS=-I$(top_srcdir)/include
+AM_CPPFLAGS=-I$(top_srcdir)/include $(SSL_CFLAGS) $(SSL_DEFS)
+