Include XML2_CFLAGS in AM_CPPFLAGS

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

diff --git a/zoom/Makefile.am b/zoom/Makefile.am
index 235e489..86cdff3 100644 (file)
--- a/zoom/Makefile.am
+++ b/zoom/Makefile.am
@@ -1,20 +1,12 @@
-## $Id: Makefile.am,v 1.7 2003-01-06 08:20:28 adam Exp $
+## $Id: Makefile.am,v 1.20 2006-08-11 12:57:31 adam Exp $
 ## Copyright (C) 2001, Index Data
 
-AM_CPPFLAGS = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include $(XML2_CFLAGS)
 
-noinst_PROGRAMS = zoomtst1 zoomtst2 zoomtst3 zoomtst4 zoomtst5 zoomtst6 zoomtst7 zoomtst8
 bin_PROGRAMS = zoomsh
+noinst_PROGRAMS = zoomtst1 zoomtst2 zoomtst3 zoomtst4 zoomtst5 zoomtst6 zoomtst7 zoomtst8 zoomtst9 zoomtst10 zoom-benchmark
 
-zoomtst1_LDADD = ../lib/libyaz.la $(GSOAP_LIB)
-zoomtst2_LDADD = ../lib/libyaz.la $(GSOAP_LIB)
-zoomtst3_LDADD = ../lib/libyaz.la $(GSOAP_LIB)
-zoomtst4_LDADD = ../lib/libyaz.la $(GSOAP_LIB)
-zoomtst5_LDADD = ../lib/libyaz.la $(GSOAP_LIB)
-zoomtst6_LDADD = ../lib/libyaz.la $(GSOAP_LIB)
-zoomtst7_LDADD = ../lib/libyazmalloc.la ../lib/libyaz.la $(GSOAP_LIB)
-zoomtst8_LDADD = ../lib/libyaz.la $(GSOAP_LIB)
-zoomsh_LDADD = ../lib/libyaz.la $(GSOAP_LIB) $(READLINE_LIBS) 
+LDADD = ../src/libyaz.la $(READLINE_LIBS)
 
 zoomtst1_SOURCES = zoomtst1.c
 zoomtst2_SOURCES = zoomtst2.c
@@ -24,4 +16,9 @@ zoomtst5_SOURCES = zoomtst5.c
 zoomtst6_SOURCES = zoomtst6.c
 zoomtst7_SOURCES = zoomtst7.c
 zoomtst8_SOURCES = zoomtst8.c
+zoomtst9_SOURCES = zoomtst9.c
+zoomtst10_SOURCES = zoomtst10.c
 zoomsh_SOURCES = zoomsh.c
+zoom_benchmark_SOURCES = zoom-benchmark.c
+
+