ICU functional for scan and snippets.

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

diff --git a/win/makefile b/win/makefile
index b440142..fde5806 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # Zebra makefile for MS NMAKE
-# $Id: makefile,v 1.56 2006-09-21 08:59:32 adam Exp $
+# $Id: makefile,v 1.72 2007-12-13 11:09:20 adam Exp $
  
 ###########################################################
 ############### Parameters 
@@ -9,7 +9,7 @@ DEBUG=0   # 0 for release, 1 for debug
 
 # EXPAT is optional. It's required for grs.xml-filters.
 HAVE_EXPAT=1
-EXPAT_DIR=c:\Expat-1.95.8
+EXPAT_DIR=c:\Program files\Expat 2.0.1
 
 # iconv is optional
 HAVE_ICONV=1
@@ -17,11 +17,11 @@ ICONV_DIR=c:\iconv-1.9.2.win32
 
 # libxslt. For alvis
 HAVE_LIBXSLT=1
-LIBXSLT_DIR=c:\libxslt-1.1.17.win32
+LIBXSLT_DIR=c:\libxslt-1.1.19.win32
 
 # libxml2. Used by libxslt
 HAVE_LIBXML2=1
-LIBXML2_DIR=c:\libxml2-2.6.26.win32
+LIBXML2_DIR=c:\libxml2-2.6.28.win32
 
 # zlib compression.  Used by libxml2
 ZLIB_DIR = c:\zlib-1.2.3.win32
@@ -39,18 +39,19 @@ all: dirs expat iconv libxml2 libxslt yaz dll zserver zebraidx tstflock
 ROOTDIR=..   # The home of zebra
 
 # YAZ include files, libraries, etc.
-YAZDIR=$(ROOTDIR)\..\YAZ
+YAZDIR=$(ROOTDIR)\..\yaz  # or \program files\yaz
+
 YAZINCL=$(YAZDIR)\include
 YAZLIBS=$(YAZLIB)
 YAZBINDIR=$(YAZDIR)\bin
 !if $(DEBUG)
-YAZLIB=$(YAZDIR)\lib\yazd.lib
-YAZ_DLL_SOURCE=$(YAZBINDIR)\yazd.dll
-YAZ_DLL_TARGET=$(BINDIR)\yazd.dll
+YAZLIB="$(YAZDIR)\lib\yaz3d.lib"
+YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz3d.dll"
+YAZ_DLL_TARGET="$(BINDIR)\yaz3d.dll"
 !else
-YAZLIB=$(YAZDIR)\lib\yaz.lib
-YAZ_DLL_SOURCE=$(YAZBINDIR)\yaz.dll
-YAZ_DLL_TARGET=$(BINDIR)\yaz.dll
+YAZLIB="$(YAZDIR)\lib\yaz3.lib"
+YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz3.dll"
+YAZ_DLL_TARGET="$(BINDIR)\yaz3.dll"
 !endif
 
 # BZIP2 settings. Uncomment and specify if you wish to use LIBBZIP2.
@@ -128,9 +129,9 @@ dll: $(DLL)
 
 !if $(HAVE_EXPAT)
 EXPAT_DEF= /D HAVE_EXPAT_H=1 /I"$(EXPAT_DIR)\source\lib"
-EXPAT_LIB= "$(EXPAT_DIR)\libs\libexpat.lib"
-EXPAT_DLL_SOURCE= "$(EXPAT_DIR)\libs\libexpat.dll"
-EXPAT_DLL_TARGET="$(BINDIR)\libexpat.dll"
+EXPAT_LIB= "$(EXPAT_DIR)\bin\libexpat.lib"
+EXPAT_DLL_SOURCE= "$(EXPAT_DIR)\bin\libexpat.dll"
+EXPAT_DLL_TARGET= "$(BINDIR)\libexpat.dll"
 expat: $(EXPAT_DLL_TARGET)
 
 $(EXPAT_DLL_TARGET) : $(EXPAT_DLL_SOURCE)
@@ -158,7 +159,7 @@ iconv:
 
 !if $(HAVE_LIBXML2)
 LIBXML2_LIB="$(LIBXML2_DIR)\lib\libxml2.lib"
-LIBXML2_DEF=/D HAVE_XML2=1 /I"$(LIBXML2_DIR)\include"
+LIBXML2_DEF=/DYAZ_HAVE_XML2=1 /D HAVE_XML2=1 /I"$(LIBXML2_DIR)\include"
 libxml2: $(BINDIR)\libxml2.dll $(BINDIR)\zlib1.dll
 
 $(BINDIR)\libxml2.dll:
@@ -192,9 +193,15 @@ libxslt:
 !if $(HAVE_LIBXSLT)
 MOD_ALVIS_OBJS= $(OBJDIR)\alvis.obj
 MOD_ALVIS_CFLAGS=/DIDZEBRA_STATIC_ALVIS=1
+
+MOD_DOM_OBJS= $(OBJDIR)\mod_dom.obj
+MOD_DOM_CFLAGS=/DIDZEBRA_STATIC_DOM=1
 !else
 MOD_ALVIS_OBJS=
 MOD_ALVIS_CFLAGS=
+
+MOD_DOM_OBJS=
+MOD_DOM_CFLAGS=
 !endif
 
 ### C and CPP compiler  (the same thing)
@@ -224,6 +231,7 @@ COMMON_C_OPTIONS=          \
   /DIDZEBRA_STATIC_GRS_MARC=1 \
   /DIDZEBRA_STATIC_GRS_DANBIB=1 \
   $(MOD_ALVIS_CFLAGS) \
+  $(MOD_DOM_CFLAGS) \
   /DIDZEBRA_STATIC_SAFARI=1 \
   $(BZIP2DEF)
 
@@ -305,21 +313,23 @@ LINK_PROGRAM= $(LINK) \
 # need to be specified, though
 
 ZSERVER_OBJS= \
-       $(OBJDIR)\zserver.obj 
+       $(OBJDIR)\zebrasrv.obj 
 
 ZEBRAIDX_OBJS= \
-       $(OBJDIR)\main.obj 
+       $(OBJDIR)\zebraidx.obj 
 TSTFLOCK_OBJS= \
        $(OBJDIR)\tstflock.obj
 
 ZEBRALIB_OBJS= \
         $(MOD_ALVIS_OBJS) \
+        $(MOD_DOM_OBJS) \
        $(OBJDIR)\atoi_zn.obj \
        $(OBJDIR)\attribute.obj \
        $(OBJDIR)\attrfind.obj \
        $(OBJDIR)\bfile.obj \
        $(OBJDIR)\bset.obj \
        $(OBJDIR)\cfile.obj \
+       $(OBJDIR)\check_res.obj \
        $(OBJDIR)\charmap.obj \
        $(OBJDIR)\close.obj \
        $(OBJDIR)\commit.obj \
@@ -352,6 +362,7 @@ ZEBRALIB_OBJS= \
        $(OBJDIR)\dirs.obj \
        $(OBJDIR)\dopen.obj \
        $(OBJDIR)\drdwr.obj \
+       $(OBJDIR)\exit.obj \
        $(OBJDIR)\extract.obj \
        $(OBJDIR)\flock.obj \
        $(OBJDIR)\imalloc.obj \
@@ -361,8 +372,10 @@ ZEBRALIB_OBJS= \
        $(OBJDIR)\isamb.obj \
        $(OBJDIR)\isamc.obj \
        $(OBJDIR)\isams.obj \
-       $(OBJDIR)\kcompare.obj \
+       $(OBJDIR)\isam_methods.obj \
+       $(OBJDIR)\it_key.obj \
        $(OBJDIR)\kcontrol.obj \
+       $(OBJDIR)\key_block.obj \
        $(OBJDIR)\kinput.obj \
        $(OBJDIR)\limit.obj \
        $(OBJDIR)\lookgrep.obj \
@@ -380,9 +393,9 @@ ZEBRALIB_OBJS= \
        $(OBJDIR)\rankstatic.obj \
        $(OBJDIR)\recctrl.obj \
        $(OBJDIR)\recgrs.obj \
+       $(OBJDIR)\records.obj \
        $(OBJDIR)\recindex.obj \
        $(OBJDIR)\reckeys.obj \
-       $(OBJDIR)\recstat.obj \
        $(OBJDIR)\rectext.obj \
        $(OBJDIR)\regxread.obj \
        $(OBJDIR)\res.obj \
@@ -392,6 +405,7 @@ ZEBRALIB_OBJS= \
        $(OBJDIR)\rsbetween.obj \
        $(OBJDIR)\rsbool.obj \
        $(OBJDIR)\rset.obj \
+       $(OBJDIR)\rset_isam.obj \
        $(OBJDIR)\rsisamb.obj \
        $(OBJDIR)\rsisamc.obj \
        $(OBJDIR)\rsisams.obj \
@@ -407,11 +421,13 @@ ZEBRALIB_OBJS= \
        $(OBJDIR)\sortidx.obj \
        $(OBJDIR)\states.obj \
        $(OBJDIR)\stream.obj \
-       $(OBJDIR)\symtab.obj \
+       $(OBJDIR)\strmap.obj \
+       $(OBJDIR)\su_codec.obj \
        $(OBJDIR)\trunc.obj \
        $(OBJDIR)\untrans.obj \
        $(OBJDIR)\update_path.obj \
        $(OBJDIR)\update_file.obj \
+       $(OBJDIR)\version.obj \
        $(OBJDIR)\xmlread.obj \
        $(OBJDIR)\xpath.obj \
        $(OBJDIR)\zaptterm.obj \
@@ -502,7 +518,7 @@ $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR):
 yaz: $(YAZ_DLL_TARGET)
 
 $(YAZ_DLL_TARGET) : $(YAZ_DLL_SOURCE)
-#      copy $(YAZBINDIR)\*.dll.manifest $(BINDIR)
-       copy $(YAZBINDIR)\*.dll $(BINDIR)
+#      copy "$(YAZBINDIR)\*.dll.manifest" $(BINDIR)
+       copy "$(YAZBINDIR)\*.dll" $(BINDIR)