Fixed bug #172: RPM builds does not enable SSL.

[yaz-moved-to-github.git] / client / Makefile.am

diff --git a/client/Makefile.am b/client/Makefile.am
index bfb2091..a5395d8 100644 (file)
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -1,27 +1,21 @@
-## Copyright (C) 1995-2003, Index Data
+## Copyright (C) 1995-2004, Index Data
 ## All rights reserved.
-## $Id: Makefile.am,v 1.21 2004-04-28 12:10:51 adam Exp $
+## $Id: Makefile.am,v 1.24 2004-10-09 08:03:26 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
 
 COMMON=admin.c admin.h tabcomplete.c tabcomplete.h
 yaz_client_SOURCES=client.c $(COMMON)
-yaz_client_ssl_SOURCES=$(COMMON)
 
-yaz_client_LDADD = ../src/libyaz.la $(READLINE_LIBS)
-yaz_client_ssl_LDADD = ssl-client.lo ../src/libyazssl.la ../src/libyaz.la $(READLINE_LIBS) $(SSL_LIBS)
-bertorture_LDADD = ../src/libyaz.la
+AM_CPPFLAGS=$(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
 
-ssl-client.lo: client.c
-       $(LTCOMPILE) $(SSL_CFLAGS) $(SSL_DEFS) -c $(srcdir)/client.c -o ssl-client.lo