X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=8aeab9159a46eec9e55642a406c8a0641eace7d9;hp=8bbd1e9f12dd33f48f59e0a08712086d1d8f823e;hb=2b35fdfa5fd016e7a0c99b0cd0958c9ce8606ef9;hpb=2ba84b155219d5d18eed5ba4d929c12abdb88f14

diff --git a/win/makefile b/win/makefile
index 8bbd1e9..8aeab91 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,17 +1,14 @@
 # This file is part of the YAZ toolkit.
-# Copyright (C) 1995-2008 Index Data
-#
-# Programmed by
-#  Heikki Levanto & Adam Dickmeiss
+# Copyright (C) Index Data
 
-# Parameters 
+# Parameters
 
-DEBUG=1   # 0 for release, 1 for debug
-USE_MANIFEST = 0
+DEBUG=0   # 0 for release, 1 for debug
+USE_MANIFEST = 1
 
 # TCL
-TCL="C:\Tcl\bin\tclsh85.exe"
-#TCL="C:\Program Files\Tcl\bin\tclsh83.exe"
+TCL=tclsh
+#TCL="C:\Tcl\bin\tclsh85.exe"
 HAVE_TCL=1
 
 # iconv charcter conversion utility
@@ -21,15 +18,17 @@ ICONV_DIR = c:\iconv-1.9.2.win32
 # icu charcter conversion utility
 # get icu libraries from http://www.icu-project.org
 HAVE_ICU=1
-ICU_DIR = c:\icu
+ICU_LIB = c:\icu\lib
+ICU_BIN = c:\icu\bin
+ICU_INCLUDE = c:\icu\include
 
 # libxslt
 HAVE_LIBXSLT=1
-LIBXSLT_DIR=c:\libxslt-1.1.24.win32
+LIBXSLT_DIR=c:\libxslt-1.1.26.win32
 
 # libxml2
 HAVE_LIBXML2=1
-LIBXML2_DIR=c:\libxml2-2.7.1.win32
+LIBXML2_DIR=c:\libxml2-2.7.6.win32
 
 # zlib compression (used by libxml2)
 ZLIB_DIR = c:\zlib-1.2.3.win32
@@ -43,25 +42,42 @@ BISON=bison
 
 default: all
 
-all: dirs generate dll sc_test 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 yaz_url
 
 NSIS="c:\program files\nsis\makensis.exe"
 HHC="c:\program files\html help workshop\hhc.exe"
 
-dist: 
+YAZ4J_DIR="..\..\yaz4j"
+
+YAZPATH="$(MAKEDIR)\.."
+
+
+dist: yaz.win32.nsi yaz.nsi distclean
+	nmake DEBUG=0 all yaz4j
+	$(NSIS) yaz.win32.nsi
+
+dist64: yaz.win64.nsi yaz.nsi distclean
+	nmake make64
+	$(NSIS) yaz.win64.nsi
+
+make64:
+	nmake DEBUG=0 HAVE_LIBXSLT=1 HAVE_LIBXML2=1 HAVE_ICONV=0 HAVE_ICU=1 LIBXML2_DIR=c:\libxml2-2.7.8.win64 LIBXSLT_DIR=c:\libxslt-1.1.26.win64 ICU_LIB=\icu64\lib64 ICU_INCLUDE=\icu64\include ICU_BIN=\icu64\bin64 YAZ4J_DIR=..\..\..\yaz4j all yaz4j
+
+
+distclean:
 	nmake DEBUG=1 clean
 	nmake DEBUG=0 clean
-	nmake DEBUG=0
-	$(NSIS) yaz.nsi
 
-nsis:
-	$(NSIS) yaz.nsi
+nsis: all yaz.win32.nsi
+	$(NSIS) yaz.win32.nsi
+
+nsis64: yaz.win64.nsi
+	$(NSIS) yaz.win64.nsi
 
 nsishelp:
 	$(NSIS)
 
-generate: generated_files
-
 # Directories
 # The current directory is supposed to be something like
 # ..../yaz/win, everything is relative to that
@@ -73,6 +89,7 @@ BINDIR=$(ROOTDIR)\bin       # We produce exes and dlls there
 WINDIR=$(ROOTDIR)\win       # all these Win make things
 SRCDIR=$(ROOTDIR)\src       # for the case we move them under src
 DOCDIR=$(ROOTDIR)\doc       # where the doc is
+JAVADIR=$(ROOTDIR)\java
 
 # where we store intermediate files
 !if $(DEBUG)
@@ -87,25 +104,30 @@ ZOOMDIR=$(ROOTDIR)\ZOOM
 UTILDIR=$(ROOTDIR)\UTIL
 TESTDIR=$(ROOTDIR)\TEST
 
-TMPDIR=$(ROOTDIR)\win\tmp
-TMP=$(TMPDIR)
+# TMPDIR=$(ROOTDIR)\win\tmp
+# TMP=$(TMPDIR)
 
 # Targets - what to make
 
 !if $(DEBUG)
-YAZ_DLL=$(BINDIR)\yaz3d.dll
-YAZ_IMPLIB=$(LIBDIR)\yaz3d.lib
-YAZ_ICU_DLL=$(BINDIR)\yaz_icu3d.dll
-YAZ_ICU_IMPLIB=$(LIBDIR)\yaz_icu3d.lib
+YAZ_DLL=$(BINDIR)\yaz5d.dll
+YAZ_IMPLIB=$(LIBDIR)\yaz5d.lib
+YAZ_ICU_DLL=$(BINDIR)\yaz_icu5d.dll
+YAZ_ICU_IMPLIB=$(LIBDIR)\yaz_icu5d.lib
+YAZ_COND_DLL=$(BINDIR)\yaz_cond5d.dll
+YAZ_COND_IMPLIB=$(LIBDIR)\yaz_cond5d.lib
 !else
-YAZ_DLL=$(BINDIR)\yaz3.dll
-YAZ_IMPLIB=$(LIBDIR)\yaz3.lib
-YAZ_ICU_DLL=$(BINDIR)\yaz_icu3.dll
-YAZ_ICU_IMPLIB=$(LIBDIR)\yaz_icu3.lib
+YAZ_DLL=$(BINDIR)\yaz5.dll
+YAZ_IMPLIB=$(LIBDIR)\yaz5.lib
+YAZ_ICU_DLL=$(BINDIR)\yaz_icu5.dll
+YAZ_ICU_IMPLIB=$(LIBDIR)\yaz_icu5.lib
+YAZ_COND_DLL=$(BINDIR)\yaz_cond5.dll
+YAZ_COND_IMPLIB=$(LIBDIR)\yaz_cond5.lib
 !endif
 
 CLIENT=$(BINDIR)\yaz-client.exe
 YAZ_ICU=$(BINDIR)\yaz-icu.exe
+YAZ_URL=$(BINDIR)\yaz-url.exe
 ZOOMSH=$(BINDIR)\zoomsh.exe
 ZTEST=$(BINDIR)\yaz-ztest.exe
 SC_TEST=$(BINDIR)\sc_test.exe
@@ -125,11 +147,12 @@ CQL2PQF=$(BINDIR)\cql2pqf.exe
 CQL2XCQL=$(BINDIR)\cql2xcql.exe
 YAZ_MARCDUMP=$(BINDIR)\yaz-marcdump.exe
 
-TSTLOG=$(BINDIR)\tstlog.exe
-TST_TIMING=$(BINDIR)\tst_timing.exe
+TSTLOG=$(BINDIR)\test_log.exe
+TST_TIMING=$(BINDIR)\test_timing.exe
+TEST_MUTEX=$(BINDIR)\test_mutex.exe
 
 # shortcut names defined here
-dll: dirs generate $(YAZ_DLL) 
+dll: dirs generate $(YAZ_DLL) $(YAZ_COND_DLL)
 client: dirs generate $(CLIENT)
 ztest: dirs generate $(ZTEST)
 
@@ -139,8 +162,10 @@ zoomsh: $(ZOOMSH) $(ZOOMTST1) $(ZOOMTST2) $(ZOOMTST3) \
  $(ZOOMTST4) $(ZOOMTST5) $(ZOOMTST6) $(ZOOMTST7) $(ZOOMTST8) $(ZOOMTST9) \
  $(ZOOMTST10)
 
-utilprog: $(CQL2PQF) $(CQL2XCQL) $(YAZ_MARCDUMP) 
-testprog: $(TSTLOG) $(TST_TIMING)
+yaz_url: $(YAZ_URL)
+
+utilprog: $(CQL2PQF) $(CQL2XCQL) $(YAZ_MARCDUMP)
+testprog: $(TSTLOG) $(TST_TIMING) $(TEST_MUTEX)
 
 htmlhelp: $(DOCDIR)\htmlhelp.chm
 
@@ -164,34 +189,28 @@ iconv:
 
 !endif
 
-###TRYING ICU FLAGS HERE WORKS  ####
-## ADAM ARE THESE FLAGS OK and the DLL sufficient ##
-##IT COMPILES AND SEEMS TO WORK
-
 !if $(HAVE_ICU)
 ICU_DEF= \
-  /D YAZ_HAVE_ICU=1 /D HAVE_ICU_H=1 \
-  /I"$(ICU_DIR)\include"
-ICU_LIB= \
-  $(ICU_DIR)\lib\icudt.lib $(ICU_DIR)\lib\icuin.lib $(ICU_DIR)\lib\icuuc.lib
-icu: $(BINDIR)\icudt40.dll $(BINDIR)\icuin40.dll $(BINDIR)\icuuc40.dll
-yazicu: dirs generate $(YAZ_ICU) 
-
-$(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)
+  /D YAZ_HAVE_ICU=1 /D HAVE_ICU_H=1 /I"$(ICU_INCLUDE)"
+ICU_LIBS= \
+  $(ICU_LIB)\icudt.lib $(ICU_LIB)\icuin.lib $(ICU_LIB)\icuuc.lib
+icu: $(BINDIR)\icudt42.dll $(BINDIR)\icuin42.dll $(BINDIR)\icuuc42.dll
+yazicu: dirs generate $(YAZ_ICU)
+
+$(BINDIR)\icudt42.dll:
+  copy "$(ICU_BIN)\icudt42.dll" $(BINDIR)
+$(BINDIR)\icuin42.dll:
+  copy "$(ICU_BIN)\icuin42.dll" $(BINDIR)
+$(BINDIR)\icuuc42.dll:
+  copy "$(ICU_BIN)\icuuc42.dll" $(BINDIR)
 !else
-ICU_DEF= \
-  /D YAZ_HAVE_ICU=0
-ICU_LIB=
+ICU_DEF= /D YAZ_HAVE_ICU=0
+ICU_LIBS=
 icu:
 yazicu:
 !endif
 
-### 
+###
 
 !if $(HAVE_LIBXML2)
 LIBXML2_LIB="$(LIBXML2_DIR)\lib\libxml2.lib"
@@ -207,7 +226,7 @@ $(BINDIR)\zlib1.dll:
 !else
 LIBXML2_LIB=
 LIBXML2_DEF=/D YAZ_HAVE_XML2=0
-libxml2: 
+libxml2:
 
 !endif
 
@@ -225,7 +244,7 @@ $(BINDIR)\libxslt.dll:
 !else
 LIBXSLT_LIB=
 LIBXSLT_DEF=/D YAZ_HAVE_XSLT=0
-libxslt: 
+libxslt:
 !endif
 
 
@@ -245,10 +264,11 @@ COMMON_C_OPTIONS=          \
   /D "WIN32"               \
   /FR"$(OBJDIR)\\"         \
   /Fo"$(OBJDIR)\\"         \
-  /Fd"$(OBJDIR)\\" 
+  /Fd"$(OBJDIR)\\"
 
 COMMON_C_INCLUDES= \
-  /I"$(ROOTDIR)\include"
+  /I"$(ROOTDIR)\include" \
+  /I"$(ROOTDIR)\libstemmer_c\include"
 
 DEBUG_C_OPTIONS=  \
   /D "_DEBUG"      \
@@ -258,21 +278,14 @@ RELEASE_C_OPTIONS=  \
   /D "NDEBUG"        \
   /MD /O2
 
-# /W3  = warning level
-# /GX  = Enable exception handling
-# /FD  = Generate file dependencies (what ever they are)
-# /c   = compile without linking
-# /FR  = Generate browse info (.sbr file that gets combined into .bsc)
-# /Fo  = object file name (or at least path)
-# /Fd  = debug database name (or path)
-# /MD  = Runtime library: Multithread DLL
-# /MDd = Runtime library: Multithread DLL (debug)
-# /Od  = Disable optimising (debug)
-# /O2  = Optimize for speed
-# /Gm  = Minimal rebuild (some cpp class stuff)
-# /Zi  = Program database for debuggers
-# /ZI  = Pgm database with special "edit&continue" stuff - not available in C5
-
+MVN_ARGS=-Dyaz.path=$(YAZPATH)
+# without >log below, mvn install does NOT work
+yaz4j: $(JAVADIR)
+	cd $(YAZ4J_DIR)
+	mvn clean
+	mvn $(MVN_ARGS) -DskipTests install >log
+	copy /Y win32\target\yaz4j.dll "$(MAKEDIR)\..\bin"
+	copy /Y any\target\yaz4j.jar "$(MAKEDIR)\..\java"
 
 ### Linker options
 LINK=link.exe
@@ -286,14 +299,14 @@ MT=echo
 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
+COMMON_LNK_OPTIONS= /nologo /subsystem:windows /incremental:no
 
-DEBUG_LNK_OPTIONS= /debug 
+DEBUG_LNK_OPTIONS= /debug
 
 RELEASE_LNK_OPTIONS=
 
-DLL_LINK_OPTIONS= /dll  
-CLIENT_LINK_OPTIONS = /subsystem:console  
+DLL_LINK_OPTIONS= /dll
+CLIENT_LINK_OPTIONS = /subsystem:console
 
 COMMON_TCL_OPTIONS= ..\util\yaz-asncomp -I$(INCLDIR) -i yaz
 
@@ -304,7 +317,7 @@ LNKOPT= $(COMMON_LNK_OPTIONS) $(DEBUG_LNK_OPTIONS)   $(LNK_LIBS)
 TCLOPT= $(COMMON_TCL_OPTIONS)
 
 !else
-COPT=   $(COMMON_C_OPTIONS)   $(RELEASE_C_OPTIONS)   $(COMMON_C_INCLUDES) 
+COPT=   $(COMMON_C_OPTIONS)   $(RELEASE_C_OPTIONS)   $(COMMON_C_INCLUDES)
 LNKOPT= $(COMMON_LNK_OPTIONS) $(RELEASE_LNK_OPTIONS) $(LNK_LIBS)
 TCLOPT= $(COMMON_TCL_OPTIONS)
 !endif
@@ -317,7 +330,7 @@ LINK_DLL = $(LINK) $(LNKOPT) \
 
 # Source and object modules
 
-# Note: Ordinary source files are not specified here at 
+# Note: Ordinary source files are not specified here at
 # all, make finds them in suitable dirs. The object modules
 # need to be specified, though
 
@@ -327,13 +340,15 @@ YAZ_CLIENT_OBJS= \
    $(OBJDIR)\admin.obj \
    $(OBJDIR)\fhistory.obj
 
-YAZ_ICU_OBJS= $(OBJDIR)\yaz-icu.obj 
+YAZ_ICU_OBJS= $(OBJDIR)\yaz-icu.obj
+YAZ_URL_OBJS= $(OBJDIR)\yaz-url.obj
+COND_DLL_OBJS= $(OBJDIR)\condvar.obj
 
 ZTEST_OBJS= \
     $(OBJDIR)\dummy-opac.obj \
     $(OBJDIR)\read-marc.obj \
     $(OBJDIR)\read-grs.obj \
-    $(OBJDIR)\ztest.obj 
+    $(OBJDIR)\ztest.obj
 
 SC_TEST_OBJS = \
    $(OBJDIR)\sc_test.obj
@@ -371,12 +386,17 @@ YAZ_MARCDUMP_OBJS = \
 
 
 TSTLOG_OBJS = \
-   $(OBJDIR)\tstlog.obj
+   $(OBJDIR)\test_log.obj
 
 TST_TIMING_OBJS = \
-   $(OBJDIR)\tst_timing.obj
+   $(OBJDIR)\test_timing.obj
+
+TEST_MUTEX_OBJS = \
+   $(OBJDIR)\test_mutex.obj
 
 MISC_OBJS= \
+   $(OBJDIR)\diag_map.obj \
+   $(OBJDIR)\base64.obj \
    $(OBJDIR)\version.obj \
    $(OBJDIR)\oid_std.obj \
    $(OBJDIR)\eventl.obj \
@@ -391,10 +411,10 @@ MISC_OBJS= \
    $(OBJDIR)\cclqual.obj \
    $(OBJDIR)\cclstr.obj \
    $(OBJDIR)\ccltoken.obj \
+   $(OBJDIR)\cclxmlconfig.obj \
    $(OBJDIR)\ccl_stop_words.obj \
    $(OBJDIR)\comstack.obj \
    $(OBJDIR)\tcpip.obj \
-   $(OBJDIR)\waislen.obj \
    $(OBJDIR)\ber_any.obj \
    $(OBJDIR)\ber_bit.obj \
    $(OBJDIR)\ber_bool.obj \
@@ -405,6 +425,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 \
@@ -424,6 +445,7 @@ MISC_OBJS= \
    $(OBJDIR)\atoin.obj \
    $(OBJDIR)\log.obj \
    $(OBJDIR)\marcdisp.obj \
+   $(OBJDIR)\marc_read_json.obj \
    $(OBJDIR)\marc_read_xml.obj \
    $(OBJDIR)\marc_read_iso2709.obj \
    $(OBJDIR)\marc_read_line.obj \
@@ -435,6 +457,7 @@ MISC_OBJS= \
    $(OBJDIR)\readconf.obj \
    $(OBJDIR)\tpath.obj \
    $(OBJDIR)\wrbuf.obj \
+   $(OBJDIR)\wrbuf_sha1.obj \
    $(OBJDIR)\xmalloc.obj \
    $(OBJDIR)\matchstr.obj \
    $(OBJDIR)\siconv.obj \
@@ -445,9 +468,9 @@ 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 \
    $(OBJDIR)\test.obj \
    $(OBJDIR)\diagbib1.obj \
    $(OBJDIR)\diagsru_update.obj \
@@ -462,28 +485,49 @@ MISC_OBJS= \
    $(OBJDIR)\sortspec.obj \
    $(OBJDIR)\charneg.obj \
    $(OBJDIR)\grs1disp.obj \
-   $(OBJDIR)\opacdisp.obj \
+   $(OBJDIR)\opac_to_xml.obj \
+   $(OBJDIR)\xml_add.obj \
+   $(OBJDIR)\xml_match.obj \
+   $(OBJDIR)\xml_to_opac.obj \
    $(OBJDIR)\zgdu.obj \
    $(OBJDIR)\soap.obj \
+   $(OBJDIR)\solr.obj \
+   $(OBJDIR)\solrtransform.obj \
+   $(OBJDIR)\sru_facet.obj \
    $(OBJDIR)\srw.obj \
    $(OBJDIR)\srwutil.obj \
    $(OBJDIR)\zoom-c.obj \
+   $(OBJDIR)\zoom-event.obj \
+   $(OBJDIR)\zoom-memcached.obj \
+   $(OBJDIR)\zoom-record-cache.obj \
+   $(OBJDIR)\zoom-z3950.obj \
+   $(OBJDIR)\zoom-sru.obj \
+   $(OBJDIR)\zoom-query.obj \
+   $(OBJDIR)\record_render.obj \
+   $(OBJDIR)\facet.obj \
    $(OBJDIR)\zoom-opt.obj \
    $(OBJDIR)\zoom-socket.obj \
    $(OBJDIR)\initopt.obj \
+   $(OBJDIR)\init_diag.obj \
+   $(OBJDIR)\init_globals.obj \
    $(OBJDIR)\xmlquery.obj \
    $(OBJDIR)\xmlerror.obj \
    $(OBJDIR)\mime.obj \
+   $(OBJDIR)\cookie.obj \
    $(OBJDIR)\cql.obj \
+   $(OBJDIR)\cql2ccl.obj \
+   $(OBJDIR)\cql_sortkeys.obj \
    $(OBJDIR)\cqlstdio.obj \
    $(OBJDIR)\cqlstring.obj \
    $(OBJDIR)\cqltransform.obj \
    $(OBJDIR)\cqlutil.obj \
    $(OBJDIR)\cqlstrer.obj \
    $(OBJDIR)\rpn2cql.obj \
+   $(OBJDIR)\rpn2solr.obj \
    $(OBJDIR)\xcqlutil.obj \
    $(OBJDIR)\elementset.obj \
    $(OBJDIR)\timing.obj \
+   $(OBJDIR)\uri.obj \
    $(OBJDIR)\query-charset.obj \
    $(OBJDIR)\tokenizer.obj \
    $(OBJDIR)\copy_types.obj \
@@ -491,12 +535,24 @@ MISC_OBJS= \
    $(OBJDIR)\match_glob.obj \
    $(OBJDIR)\poll.obj \
    $(OBJDIR)\daemon.obj \
+   $(OBJDIR)\iconv_encode_danmarc.obj \
    $(OBJDIR)\iconv_encode_iso_8859_1.obj \
    $(OBJDIR)\iconv_encode_marc8.obj \
    $(OBJDIR)\iconv_decode_marc8.obj \
    $(OBJDIR)\iconv_encode_wchar.obj \
+   $(OBJDIR)\iconv_decode_iso5426.obj \
+   $(OBJDIR)\iconv_decode_danmarc.obj \
    $(OBJDIR)\mutex.obj \
-   $(OBJDIR)\sc.obj
+   $(OBJDIR)\thread_create.obj \
+   $(OBJDIR)\spipe.obj \
+   $(OBJDIR)\gettimeofday.obj \
+   $(OBJDIR)\json.obj \
+   $(OBJDIR)\sc.obj \
+   $(OBJDIR)\xml_include.obj \
+   $(OBJDIR)\file_glob.obj \
+   $(OBJDIR)\thread_id.obj \
+   $(OBJDIR)\dirent.obj \
+   $(OBJDIR)\url.obj
 
 Z3950_OBJS= \
    $(OBJDIR)\z-date.obj\
@@ -528,24 +584,40 @@ Z3950_OBJS= \
    $(OBJDIR)\prt-ext.obj \
    $(OBJDIR)\z-charneg.obj \
    $(OBJDIR)\z-mterm2.obj \
-   $(OBJDIR)\z-oclcui.obj
+   $(OBJDIR)\z-oclcui.obj \
+   $(OBJDIR)\z-facet-1.obj
 
 ILL_OBJS= \
    $(OBJDIR)\ill-get.obj\
    $(OBJDIR)\ill-core.obj\
    $(OBJDIR)\item-req.obj
 
+STEMMER_OBJS = \
+   $(OBJDIR)\libstemmer.obj \
+   $(OBJDIR)\api.obj \
+   $(OBJDIR)\utilities.obj \
+   $(OBJDIR)\stem_UTF_8_porter.obj \
+   $(OBJDIR)\stem_UTF_8_english.obj
+
 DLL_OBJS =\
    $(MISC_OBJS) \
    $(Z3950_OBJS) \
-   $(ILL_OBJS) \
-   
+   $(ILL_OBJS)
+
 ICU_DLL_OBJS =\
-   $(OBJDIR)\icu_I18N.obj
+   $(OBJDIR)\icu_chain.obj \
+   $(OBJDIR)\icu_utf16.obj \
+   $(OBJDIR)\icu_utf8.obj \
+   $(OBJDIR)\icu_transform.obj \
+   $(OBJDIR)\icu_casemap.obj \
+   $(OBJDIR)\icu_tokenizer.obj \
+   $(OBJDIR)\icu_sortkey.obj \
+   $(OBJDIR)\stemmer.obj \
+   $(STEMMER_OBJS)
 
 # Generated C and H files
 
-Z3950_C_DIR=$(SRCDIR)   
+Z3950_C_DIR=$(SRCDIR)
 ILL_C_DIR=$(SRCDIR)
 #!!! Should be moved to OBJ, but that requires too much trickery
 
@@ -577,6 +649,10 @@ MTERM2_C_FILES = $(Z3950_C_DIR)\z-mterm2.c
 OCLCUI_H_FILES = $(INCLDIR)\yaz\z-oclcui.h
 OCLCUI_C_FILES = $(Z3950_C_DIR)\z-oclcui.c
 
+# Files generated from facet.asn
+FACET_H_FILES = $(INCLDIR)\yaz\z-facet-1.h
+FACET_C_FILES = $(Z3950_C_DIR)\z-facet-1.c
+
 # Files created from z3950v3.asn
 Z3950V3_H_FILES= \
    $(INCLDIR)\yaz\z-accdes1.h \
@@ -631,6 +707,7 @@ ITEM_REQ_FILES= $(ITEM_REQ_C_FILES) $(ITEM_REQ_H_FILES)
 CHARNEG_FILES = $(CHARNEG_C_FILES) $(CHARNEG_H_FILES)
 MTERM2_FILES = $(MTERM2_C_FILES) $(MTERM2_H_FILES)
 OCLCUI_FILES = $(OCLCUI_C_FILES) $(OCLCUI_H_FILES)
+FACET_FILES = $(FACET_C_FILES) $(FACET_H_FILES)
 
 GENERATED_C_FILES= \
    $(Z3950V3_C_FILES)  \
@@ -641,6 +718,7 @@ GENERATED_C_FILES= \
    $(CHARNEG_C_FILES) \
    $(MTERM2_C_FILES) \
    $(OCLCUI_C_FILES) \
+   $(FACET_C_FILES) \
    $(ILL_CORE_C_FILES) \
    $(ITEM_REQ_C_FILES)
 
@@ -653,17 +731,19 @@ GENERATED_H_FILES= \
    $(CHARNEG_H_FILES) \
    $(MTERM2_H_FILES) \
    $(OCLCUI_H_FILES) \
+   $(FACET_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 
+# Compiling
 
 # Note: This defines where to look for the necessary
 # source files. Funny way of doing it, but it works.
@@ -678,20 +758,29 @@ generated_files: \
 
 # Server
 {$(SERVERDIR)}.c{$(OBJDIR)}.obj:
-	$(CPP) $(COPT) $< 
+	$(CPP) $(COPT) $<
 
 # Various YAZ source directories
 {$(SRCDIR)}.c{$(OBJDIR)}.obj:
-	$(CPP) $(COPT) /D"YAZ_DLL" $< 
+	$(CPP) $(COPT) /D"YAZ_DLL" $<
 
 {$(ZOOMDIR)}.c{$(OBJDIR)}.obj:
-	$(CPP) $(COPT) $< 
+	$(CPP) $(COPT) $<
 
 {$(UTILDIR)}.c{$(OBJDIR)}.obj:
-	$(CPP) $(COPT) $< 
+	$(CPP) $(COPT) $<
 
 {$(TESTDIR)}.c{$(OBJDIR)}.obj:
-	$(CPP) $(COPT) $< 
+	$(CPP) $(COPT) $<
+
+{$(ROOTDIR)\libstemmer_c\libstemmer}.c{$(OBJDIR)}.obj:
+	$(CPP) $(COPT) $<
+
+{$(ROOTDIR)\libstemmer_c\runtime}.c{$(OBJDIR)}.obj:
+	$(CPP) $(COPT) $<
+
+{$(ROOTDIR)\libstemmer_c\src_c}.c{$(OBJDIR)}.obj:
+	$(CPP) $(COPT) $<
 
 # ASN-generated files
 
@@ -737,6 +826,11 @@ $(OCLCUI_FILES): $(SRCDIR)\oclcui.asn
 	$(TCL) $(TCLOPT) -d z.tcl oclcui.asn
 	@cd $(WINDIR)
 
+$(FACET_FILES): $(SRCDIR)\facet.asn
+	@cd $(SRCDIR)
+	$(TCL) $(TCLOPT) -d z.tcl facet.asn
+	@cd $(WINDIR)
+
 $(ILL_CORE_FILES): $(SRCDIR)\ill9702.asn
 	@cd $(SRCDIR)
 	$(TCL) $(TCLOPT) -d ill.tcl ill9702.asn
@@ -755,7 +849,11 @@ $(SRCDIR)\marc8r.c: $(SRCDIR)\codetables.xml $(SRCDIR)\charconv.tcl
 	@cd $(SRCDIR)
 	$(TCL) charconv.tcl -r -p marc8r codetables.xml -o marc8r.c
 
-$(SRCDIR)\oid_std.c: $(SRCDIR)\oid.csv $(SRCDIR)\charconv.tcl
+$(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
 	@cd $(SRCDIR)
 	$(TCL) oidtoc.tcl $(SRCDIR) oid.csv oid_std.c oid_std.h
 
@@ -771,6 +869,11 @@ $(SRCDIR)\diagsru_update.c: $(SRCDIR)\sru_update.csv
 	@cd $(SRCDIR)
 	$(TCL) csvtosru_update.tcl $(SRCDIR)
 
+$(INCLDIR)\yaz\yaz-version.h: $(ROOTDIR)/IDMETA
+	@cd $(SRCDIR)
+	$(TCL) mk_version.tcl $(ROOTDIR)/IDMETA $(INCLDIR)\yaz\yaz-version.h
+
+
 !endif
 
 !if $(HAVE_BISON)
@@ -795,10 +898,10 @@ RSOPT=/d_NDEBUG
 !endif
 
 $(YAZ_RES): $(YAZ_RC)
-	$(RSC) $(RSOPT) /I"../include" /fo"$(YAZ_RES)" $(YAZ_RC) 
+	$(RSC) $(RSOPT) /I"../include" /fo"$(YAZ_RES)" $(YAZ_RC)
 
 $(YAZ_ICU_RES): $(YAZ_RC)
-	$(RSC) $(RSOPT) /DICU=1 /I"../include" /fo"$(YAZ_ICU_RES)" $(YAZ_RC) 
+	$(RSC) $(RSOPT) /DICU=1 /I"../include" /fo"$(YAZ_ICU_RES)" $(YAZ_RC)
 
 # Linking
 
@@ -807,15 +910,23 @@ $(YAZ_DLL) $(YAZ_IMPLIB): "$(BINDIR)" $(DLL_OBJS) $(YAZ_RES)
 		$(DLL_OBJS) \
 		$(YAZ_RES) \
 		/out:$@ \
-		/implib:"$(YAZ_IMPLIB)" 
+		/implib:"$(YAZ_IMPLIB)"
 	$(MT) -manifest $@.manifest -outputresource:$@;2
 
 $(YAZ_ICU_DLL) $(YAZ_ICU_IMPLIB): "$(BINDIR)" $(ICU_DLL_OBJS) $(YAZ_ICU_RES)
-	$(LINK_DLL) $(ICU_LIB) $(YAZ_IMPLIB)\
+	$(LINK_DLL) $(ICU_LIBS) $(YAZ_IMPLIB)\
 		$(ICU_DLL_OBJS) \
 		$(YAZ_ICU_RES) \
 		/out:$@ \
-		/implib:"$(YAZ_ICU_IMPLIB)" 
+		/implib:"$(YAZ_ICU_IMPLIB)"
+	$(MT) -manifest $@.manifest -outputresource:$@;2
+
+$(YAZ_COND_DLL) $(YAZ_COND_IMPLIB): "$(BINDIR)" $(COND_DLL_OBJS) $(YAZ_COND_RES)
+	$(LINK_DLL) $(COND_LIB) $(YAZ_IMPLIB)\
+		$(COND_DLL_OBJS) \
+		$(YAZ_COND_RES) \
+		/out:$@ \
+		/implib:"$(YAZ_COND_IMPLIB)"
 	$(MT) -manifest $@.manifest -outputresource:$@;2
 
 $(CLIENT) : "$(BINDIR)" $(YAZ_CLIENT_OBJS) $(YAZ_DLL)
@@ -823,9 +934,12 @@ $(CLIENT) : "$(BINDIR)" $(YAZ_CLIENT_OBJS) $(YAZ_DLL)
 	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(YAZ_ICU) : "$(BINDIR)" $(YAZ_ICU_OBJS) $(YAZ_ICU_DLL)
-	$(LINK_PROGRAM) $(ICU_LIB) $(YAZ_ICU_IMPLIB) $(YAZ_ICU_OBJS) /out:$@
+	$(LINK_PROGRAM) $(ICU_LIBS) $(YAZ_ICU_IMPLIB) $(YAZ_ICU_OBJS) /out:$@
 	$(MT) -manifest $@.manifest -outputresource:$@;1
 
+$(YAZ_URL) : "$(BINDIR)" $(YAZ_URL_OBJS) $(YAZ_DLL)
+	$(LINK_PROGRAM) $(YAZ_URL_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(SC_TEST) : "$(BINDIR)" $(SC_TEST_OBJS) $(YAZ_DLL)
 	$(LINK_PROGRAM) $(SC_TEST_OBJS) /out:$@
@@ -900,6 +1014,10 @@ $(TST_TIMING) : "$(BINDIR)" $(TST_TIMING_OBJS) $(YAZ_DLL)
 	$(LINK_PROGRAM) $(TST_TIMING_OBJS) /out:$@
 	$(MT) -manifest $@.manifest -outputresource:$@;1
 
+$(TEST_MUTEX) : "$(BINDIR)" $(TEST_MUTEX_OBJS) $(YAZ_COND_DLL)
+	$(LINK_PROGRAM) $(YAZ_COND_IMPLIB) $(TEST_MUTEX_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
+
 # Other rules
 
 $(DOCDIR)\htmlhelp.chm: $(DOCDIR)\htmlhelp.hhp
@@ -936,7 +1054,7 @@ realclean: clean
 # check directories and create if needed
 dirs: $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR)
 
-$(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR):
+$(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR) $(JAVADIR):
 	if not exist "$@/$(NUL)" mkdir "$@"