Error utils in separate file and _REENTRANT mode.

[yaz-moved-to-github.git] / win / makefile

diff --git a/win/makefile b/win/makefile
index f9f40a4..8f45dd3 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -1,6 +1,5 @@
-# Copyright (C) 1995-2008, Index Data ApS
-# All rights reserved.
-# $Id: makefile,v 1.145 2008-02-21 10:15:31 adam Exp $
+# This file is part of the YAZ toolkit.
+# Copyright (C) 1995-2009 Index Data
 #
 # Programmed by
 #  Heikki Levanto & Adam Dickmeiss
@@ -11,7 +10,7 @@ DEBUG=0   # 0 for release, 1 for debug
 USE_MANIFEST = 0
 
 # TCL
-TCL="C:\Tcl\bin\tclsh84.exe"
+TCL="C:\Tcl\bin\tclsh85.exe"
 #TCL="C:\Program Files\Tcl\bin\tclsh83.exe"
 HAVE_TCL=1
 
@@ -26,11 +25,11 @@ ICU_DIR = c:\icu
 
 # libxslt
 HAVE_LIBXSLT=1
-LIBXSLT_DIR=c:\libxslt-1.1.19.win32
+LIBXSLT_DIR=c:\libxslt-1.1.24.win32
 
 # libxml2
 HAVE_LIBXML2=1
-LIBXML2_DIR=c:\libxml2-2.6.28.win32
+LIBXML2_DIR=c:\libxml2-2.7.1.win32
 
 # zlib compression (used by libxml2)
 ZLIB_DIR = c:\zlib-1.2.3.win32
@@ -44,7 +43,7 @@ BISON=bison
 
 default: all
 
-all: dirs generate dll client ztest yazicu zoomsh utilprog testprog iconv icu libxml2 libxslt
+all: dirs generate dll sc_test client ztest yazicu zoomsh utilprog testprog iconv icu libxml2 libxslt
 
 NSIS="c:\program files\nsis\makensis.exe"
 HHC="c:\program files\html help workshop\hhc.exe"
@@ -61,8 +60,6 @@ nsis:
 nsishelp:
        $(NSIS)
 
-generate: generated_files
-
 # Directories
 # The current directory is supposed to be something like
 # ..../yaz/win, everything is relative to that
@@ -109,6 +106,7 @@ CLIENT=$(BINDIR)\yaz-client.exe
 YAZ_ICU=$(BINDIR)\yaz-icu.exe
 ZOOMSH=$(BINDIR)\zoomsh.exe
 ZTEST=$(BINDIR)\yaz-ztest.exe
+SC_TEST=$(BINDIR)\sc_test.exe
 
 ZOOMTST1=$(BINDIR)\zoomtst1.exe
 ZOOMTST2=$(BINDIR)\zoomtst2.exe
@@ -133,6 +131,8 @@ dll: dirs generate $(YAZ_DLL)
 client: dirs generate $(CLIENT)
 ztest: dirs generate $(ZTEST)
 
+sc_test: $(SC_TEST)
+
 zoomsh: $(ZOOMSH) $(ZOOMTST1) $(ZOOMTST2) $(ZOOMTST3) \
  $(ZOOMTST4) $(ZOOMTST5) $(ZOOMTST6) $(ZOOMTST7) $(ZOOMTST8) $(ZOOMTST9) \
  $(ZOOMTST10)
@@ -172,15 +172,15 @@ ICU_DEF= \
   /I"$(ICU_DIR)\include"
 ICU_LIB= \
   $(ICU_DIR)\lib\icudt.lib $(ICU_DIR)\lib\icuin.lib $(ICU_DIR)\lib\icuuc.lib
-icu: $(BINDIR)\icudt38.dll $(BINDIR)\icuin38.dll $(BINDIR)\icuuc38.dll
+icu: $(BINDIR)\icudt40.dll $(BINDIR)\icuin40.dll $(BINDIR)\icuuc40.dll
 yazicu: dirs generate $(YAZ_ICU) 
 
-$(BINDIR)\icudt38.dll:
-  copy "$(ICU_DIR)\bin\icudt38.dll" $(BINDIR)
-$(BINDIR)\icuin38.dll:
-  copy "$(ICU_DIR)\bin\icuin38.dll" $(BINDIR)
-$(BINDIR)\icuuc38.dll:
-  copy "$(ICU_DIR)\bin\icuuc38.dll" $(BINDIR)
+$(BINDIR)\icudt40.dll:
+  copy "$(ICU_DIR)\bin\icudt40.dll" $(BINDIR)
+$(BINDIR)\icuin40.dll:
+  copy "$(ICU_DIR)\bin\icuin40.dll" $(BINDIR)
+$(BINDIR)\icuuc40.dll:
+  copy "$(ICU_DIR)\bin\icuuc40.dll" $(BINDIR)
 !else
 ICU_DEF= \
   /D YAZ_HAVE_ICU=0
@@ -281,7 +281,7 @@ MT=mt.exe /nologo
 MT=echo
 !endif
 
-LINK_LIBS= kernel32.lib wsock32.lib advapi32.lib \
+LINK_LIBS= kernel32.lib ws2_32.lib advapi32.lib \
           $(ICONV_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB)
 
 COMMON_LNK_OPTIONS= /nologo /subsystem:windows /machine:i386 /incremental:no
@@ -328,10 +328,14 @@ YAZ_CLIENT_OBJS= \
 YAZ_ICU_OBJS= $(OBJDIR)\yaz-icu.obj 
 
 ZTEST_OBJS= \
+    $(OBJDIR)\dummy-opac.obj \
     $(OBJDIR)\read-marc.obj \
     $(OBJDIR)\read-grs.obj \
     $(OBJDIR)\ztest.obj 
 
+SC_TEST_OBJS = \
+   $(OBJDIR)\sc_test.obj
+
 YAZ_ZOOMSH_OBJS = \
    $(OBJDIR)\zoomsh.obj
 
@@ -375,7 +379,6 @@ MISC_OBJS= \
    $(OBJDIR)\oid_std.obj \
    $(OBJDIR)\eventl.obj \
    $(OBJDIR)\requestq.obj \
-   $(OBJDIR)\service.obj \
    $(OBJDIR)\seshigh.obj \
    $(OBJDIR)\statserv.obj \
    $(OBJDIR)\tcpdchk.obj \
@@ -400,6 +403,7 @@ MISC_OBJS= \
    $(OBJDIR)\ber_oid.obj \
    $(OBJDIR)\ber_tag.obj \
    $(OBJDIR)\dumpber.obj \
+   $(OBJDIR)\errno.obj \
    $(OBJDIR)\odr.obj \
    $(OBJDIR)\odr_any.obj \
    $(OBJDIR)\odr_bit.obj \
@@ -440,6 +444,7 @@ MISC_OBJS= \
    $(OBJDIR)\snprintf.obj \
    $(OBJDIR)\marc8.obj \
    $(OBJDIR)\marc8r.obj \
+   $(OBJDIR)\iso5426.obj \
    $(OBJDIR)\record_conv.obj \
    $(OBJDIR)\retrieval.obj \
    $(OBJDIR)\libxml2_error.obj \
@@ -475,6 +480,7 @@ MISC_OBJS= \
    $(OBJDIR)\cqltransform.obj \
    $(OBJDIR)\cqlutil.obj \
    $(OBJDIR)\cqlstrer.obj \
+   $(OBJDIR)\rpn2cql.obj \
    $(OBJDIR)\xcqlutil.obj \
    $(OBJDIR)\elementset.obj \
    $(OBJDIR)\timing.obj \
@@ -488,7 +494,11 @@ MISC_OBJS= \
    $(OBJDIR)\iconv_encode_iso_8859_1.obj \
    $(OBJDIR)\iconv_encode_marc8.obj \
    $(OBJDIR)\iconv_decode_marc8.obj \
-   $(OBJDIR)\iconv_encode_wchar.obj
+   $(OBJDIR)\iconv_encode_wchar.obj \
+   $(OBJDIR)\iconv_decode_iso5426.obj \
+   $(OBJDIR)\iconv_decode_danmarc.obj \
+   $(OBJDIR)\mutex.obj \
+   $(OBJDIR)\sc.obj
 
 Z3950_OBJS= \
    $(OBJDIR)\z-date.obj\
@@ -648,12 +658,13 @@ GENERATED_H_FILES= \
    $(ILL_CORE_H_FILES) \
    $(ITEM_REQ_H_FILES)
 
-generated_files: \
+generate: \
        $(GENERATED_H_FILES) \
        $(GENERATED_C_FILES) \
        $(SRCDIR)\diagsrw.c \
        $(SRCDIR)\diagbib1.c \
-       $(SRCDIR)\diagsru_update.c 
+       $(SRCDIR)\diagsru_update.c \
+       $(INCLDIR)\yaz\yaz-version.h 
 
 # Compiling 
 
@@ -747,6 +758,10 @@ $(SRCDIR)\marc8r.c: $(SRCDIR)\codetables.xml $(SRCDIR)\charconv.tcl
        @cd $(SRCDIR)
        $(TCL) charconv.tcl -r -p marc8r codetables.xml -o marc8r.c
 
+$(SRCDIR)\iso5426.c: $(SRCDIR)\codetables-iso5426.xml $(SRCDIR)\charconv.tcl
+       @cd $(SRCDIR)
+       $(TCL) charconv.tcl -r -p iso5426 codetables-iso5426.xml -o iso5426.c
+
 $(SRCDIR)\oid_std.c: $(SRCDIR)\oid.csv $(SRCDIR)\charconv.tcl
        @cd $(SRCDIR)
        $(TCL) oidtoc.tcl $(SRCDIR) oid.csv oid_std.c oid_std.h
@@ -763,6 +778,11 @@ $(SRCDIR)\diagsru_update.c: $(SRCDIR)\sru_update.csv
        @cd $(SRCDIR)
        $(TCL) csvtosru_update.tcl $(SRCDIR)
 
+$(INCLDIR)\yaz\yaz-version.h:
+       @cd $(SRCDIR)
+       $(TCL) mk_version.tcl $(ROOTDIR)/configure.ac $(INCLDIR)\yaz\yaz-version.h
+
+
 !endif
 
 !if $(HAVE_BISON)
@@ -819,6 +839,10 @@ $(YAZ_ICU) : "$(BINDIR)" $(YAZ_ICU_OBJS) $(YAZ_ICU_DLL)
        $(MT) -manifest $@.manifest -outputresource:$@;1
 
 
+$(SC_TEST) : "$(BINDIR)" $(SC_TEST_OBJS) $(YAZ_DLL)
+       $(LINK_PROGRAM) $(SC_TEST_OBJS) /out:$@
+       $(MT) -manifest $@.manifest -outputresource:$@;1
+
 $(ZOOMSH) : "$(BINDIR)" $(YAZ_ZOOMSH_OBJS) $(YAZ_DLL)
        $(LINK_PROGRAM) $(YAZ_ZOOMSH_OBJS) /out:$@
        $(MT) -manifest $@.manifest -outputresource:$@;1