Include XML2_CFLAGS in AM_CPPFLAGS

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

diff --git a/client/Makefile.am b/client/Makefile.am
index d26dc49..8516cdc 100644 (file)
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -1,19 +1,23 @@
-## Copyright (C) 1995-2000, Index Data
+## Copyright (C) 1995-2004, Index Data
 ## All rights reserved.
-## $Id: Makefile.am,v 1.16 2002-04-15 09:44:41 adam Exp $
+## $Id: Makefile.am,v 1.27 2006-08-11 12:57:30 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)
+
+AM_CFLAGS=$(THREAD_CFLAGS)
+
+AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS) $(SSL_CFLAGS)
+
+yaz_client_LDADD = ../src/libyaz.la $(READLINE_LIBS) 
+bertorture_LDADD = ../src/libyaz.la 
+
+bertorture_SOURCES=bertorture.c
 
-yaz_client_LDADD = ../lib/libyaz.la $(READLINE_LIBS)
-yaz_client_ssl_LDADD = ../lib/libyazssl.la ../lib/libyaz.la $(READLINE_LIBS) $(SSL_LIBS)
 
-AM_CPPFLAGS=-I$(top_srcdir)/include