X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=93d049ef9d12479183ca273cebed5624bb4e420d;hp=4ad963464aee0015dec40094b51b4181202e9801;hb=11d3339c3128f129598072d1372d4bcc4aaeab14;hpb=8383a8bbc36d4ef3bf8393efcb2fe346570d6a46

diff --git a/win/makefile b/win/makefile
index 4ad9634..93d049e 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,6 +1,6 @@
 # Copyright (C) 1994-2006, Index Data ApS
 # All rights reserved.
-# $Id: makefile,v 1.112 2006-07-05 13:05:32 adam Exp $
+# $Id: makefile,v 1.117 2006-08-03 09:27:23 adam Exp $
 #
 # Programmed by
 #  Heikki Levanto & Adam Dickmeiss
@@ -16,15 +16,15 @@ HAVE_TCL=1
 
 # iconv charcter conversion utility
 HAVE_ICONV=1
-ICONV_DIR = c:\iconv-1.9.1.win32
+ICONV_DIR = c:\iconv-1.9.2.win32
 
 # libxslt
 HAVE_LIBXSLT=1
-LIBXSLT_DIR=c:\libxslt-1.1.14.win32
+LIBXSLT_DIR=c:\libxslt-1.1.17.win32
 
 # libxml2
 HAVE_LIBXML2=1
-LIBXML2_DIR=c:\libxml2-2.6.20.win32
+LIBXML2_DIR=c:\libxml2-2.6.26.win32
 
 # zlib compression (used by libxml2)
 ZLIB_DIR = c:\zlib-1.2.3.win32
@@ -151,7 +151,7 @@ iconv:
 
 !if $(HAVE_LIBXML2)
 LIBXML2_LIB="$(LIBXML2_DIR)\lib\libxml2.lib"
-LIBXML2_DEF=/D HAVE_XML2=1 /I"$(LIBXML2_DIR)\include"
+LIBXML2_DEF=/D YAZ_HAVE_XML2=1 /I"$(LIBXML2_DIR)\include"
 libxml2: $(BINDIR)\libxml2.dll $(BINDIR)\zlib1.dll
 
 $(BINDIR)\libxml2.dll:
@@ -162,7 +162,7 @@ $(BINDIR)\zlib1.dll:
 
 !else
 LIBXML2_LIB=
-LIBXML2_DEF=/D HAVE_XML2=0
+LIBXML2_DEF=/D YAZ_HAVE_XML2=0
 libxml2: 
 
 !endif
@@ -171,7 +171,7 @@ libxml2:
 LIBXSLT_LIB="$(LIBXSLT_DIR)\lib\libxslt.lib"
 LIBXSLT_DEF= \
 	/D HAVE_XSLTSAVERESULTTOSTRING=1 \
-	/D HAVE_XSLT=1 \
+	/D YAZ_HAVE_XSLT=1 \
 	/I"$(LIBXSLT_DIR)\include"
 libxslt: $(BINDIR)\libxslt.dll
 
@@ -180,7 +180,7 @@ $(BINDIR)\libxslt.dll:
 
 !else
 LIBXSLT_LIB=
-LIBXSLT_DEF=/D HAVE_XSLT=0
+LIBXSLT_DEF=/D YAZ_HAVE_XSLT=0
 libxslt: 
 !endif
 
@@ -280,6 +280,11 @@ YAZ_CLIENT_OBJS= \
    $(OBJDIR)\tabcomplete.obj \
    $(OBJDIR)\admin.obj
 
+ZTEST_OBJS= \
+    $(OBJDIR)\read-marc.obj \
+    $(OBJDIR)\read-grs.obj \
+    $(OBJDIR)\ztest.obj 
+
 YAZ_ZOOMSH_OBJS = \
    $(OBJDIR)\zoomsh.obj
 
@@ -312,34 +317,26 @@ YAZ_MARCDUMP_OBJS = \
 TSTLOG_OBJS = \
    $(OBJDIR)\tstlog.obj
 
-YAZ_SERVER_OBJS= \
-   "$(OBJDIR)\eventl.obj" \
-   "$(OBJDIR)\requestq.obj" \
-   "$(OBJDIR)\service.obj" \
-   "$(OBJDIR)\seshigh.obj" \
-   "$(OBJDIR)\statserv.obj" \
-   "$(OBJDIR)\tcpdchk.obj" 
-
-ZTEST_OBJS= \
-   "$(OBJDIR)\read-marc.obj" \
-   "$(OBJDIR)\read-grs.obj" \
-   "$(OBJDIR)\ztest.obj" 
-
-YAZ_CCL_OBJS= \
+MISC_OBJS= \
+   $(OBJDIR)\version.obj \
+   $(OBJDIR)\nfa.obj \
+   $(OBJDIR)\nfaxml.obj \
+   $(OBJDIR)\eventl.obj \
+   $(OBJDIR)\requestq.obj \
+   $(OBJDIR)\service.obj \
+   $(OBJDIR)\seshigh.obj \
+   $(OBJDIR)\statserv.obj \
+   $(OBJDIR)\tcpdchk.obj \
    $(OBJDIR)\cclerrms.obj \
    $(OBJDIR)\cclfind.obj \
    $(OBJDIR)\cclptree.obj \
    $(OBJDIR)\cclqfile.obj \
    $(OBJDIR)\cclqual.obj \
    $(OBJDIR)\cclstr.obj \
-   $(OBJDIR)\ccltoken.obj
-
-YAZ_COMSTACK_OBJS= \
+   $(OBJDIR)\ccltoken.obj \
    $(OBJDIR)\comstack.obj \
    $(OBJDIR)\tcpip.obj \
-   $(OBJDIR)\waislen.obj 
-
-YAZ_ODR_OBJS= \
+   $(OBJDIR)\waislen.obj \
    $(OBJDIR)\ber_any.obj \
    $(OBJDIR)\ber_bit.obj \
    $(OBJDIR)\ber_bool.obj \
@@ -365,10 +362,7 @@ YAZ_ODR_OBJS= \
    $(OBJDIR)\odr_seq.obj \
    $(OBJDIR)\odr_tag.obj \
    $(OBJDIR)\odr_use.obj \
-   $(OBJDIR)\odr_util.obj 
-
-YAZ_UTIL_OBJS= \
-   $(OBJDIR)\version.obj \
+   $(OBJDIR)\odr_util.obj \
    $(OBJDIR)\atoin.obj \
    $(OBJDIR)\log.obj \
    $(OBJDIR)\marcdisp.obj \
@@ -387,9 +381,7 @@ YAZ_UTIL_OBJS= \
    $(OBJDIR)\record_conv.obj \
    $(OBJDIR)\retrieval.obj \
    $(OBJDIR)\libxml2_error.obj \
-   $(OBJDIR)\test.obj
-
-YAZ_ZUTIL_OBJS= \
+   $(OBJDIR)\test.obj \
    $(OBJDIR)\diagbib1.obj \
    $(OBJDIR)\diagsrw.obj \
    $(OBJDIR)\diag-entry.obj \
@@ -412,7 +404,14 @@ YAZ_ZUTIL_OBJS= \
    $(OBJDIR)\zoom-opt.obj \
    $(OBJDIR)\initopt.obj \
    $(OBJDIR)\xmlquery.obj \
-   $(OBJDIR)\mime.obj
+   $(OBJDIR)\mime.obj \
+   $(OBJDIR)\cql.obj \
+   $(OBJDIR)\cqlstdio.obj \
+   $(OBJDIR)\cqlstring.obj \
+   $(OBJDIR)\cqltransform.obj \
+   $(OBJDIR)\cqlutil.obj \
+   $(OBJDIR)\cqlstrer.obj \
+   $(OBJDIR)\xcqlutil.obj
 
 Z3950_OBJS= \
    $(OBJDIR)\z-date.obj\
@@ -451,27 +450,10 @@ ILL_OBJS= \
    $(OBJDIR)\ill-core.obj\
    $(OBJDIR)\item-req.obj
 
-YAZ_CQL_OBJS = \
-   $(OBJDIR)\cql.obj \
-   $(OBJDIR)\cqlstdio.obj \
-   $(OBJDIR)\cqlstring.obj \
-   $(OBJDIR)\cqltransform.obj \
-   $(OBJDIR)\cqlutil.obj \
-   $(OBJDIR)\cqlstrer.obj \
-   $(OBJDIR)\xcqlutil.obj
-
-YAZ_OBJS =\
-   $(YAZ_UTIL_OBJS) \
-   $(YAZ_ODR_OBJS) \
-   $(YAZ_COMSTACK_OBJS) \
+DLL_OBJS =\
+   $(MISC_OBJS) \
    $(Z3950_OBJS) \
    $(ILL_OBJS) \
-   $(YAZ_ZUTIL_OBJS) \
-   $(YAZ_CCL_OBJS) \
-   $(YAZ_CQL_OBJS) \
-   $(YAZ_SERVER_OBJS)
-
-DLL_OBJS= $(YAZ_OBJS)
 
 # Generated C and H files
 
@@ -570,7 +552,9 @@ GENERATED_C_FILES= \
    $(ESADMIN_C_FILES) \
    $(CHARNEG_C_FILES) \
    $(MTERM2_C_FILES) \
-   $(OCLCUI_C_FILES)
+   $(OCLCUI_C_FILES) \
+   $(ILL_CORE_C_FILES) \
+   $(ITEM_REQ_C_FILES)
 
 GENERATED_H_FILES= \
    $(Z3950V3_H_FILES)  \
@@ -580,11 +564,15 @@ GENERATED_H_FILES= \
    $(ESADMIN_H_FILES) \
    $(CHARNEG_H_FILES) \
    $(MTERM2_H_FILES) \
-   $(OCLCUI_H_FILES)
+   $(OCLCUI_H_FILES) \
+   $(ILL_CORE_H_FILES) \
+   $(ITEM_REQ_H_FILES)
 
 generated_files: \
 	$(GENERATED_H_FILES) \
 	$(GENERATED_C_FILES) \
+	$(SRCDIR)\diagsrw.c \
+	$(SRCDIR)\diagbib1.c 
 
 # Compiling