X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=3d8acbd2454314a1736f7ff69d4f861738468d90;hb=5690a02eb4b66139814483dab8e7a5b5fcb74a55;hp=7f98134a2a8c93054191fa91a7189a15c49a629c;hpb=0f78f3fe78e859d9f0d3f0d3e13fcd28085dd427;p=idzebra-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index 7f98134..3d8acbd 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # Zebra makefile for MS NMAKE
-# $Id: makefile,v 1.59 2006-11-14 08:12:11 adam Exp $
+# $Id: makefile,v 1.65 2007-08-22 12:36:22 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
@@ -45,13 +45,13 @@ 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.
@@ -129,13 +129,13 @@ 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)"
-	copy "$(EXPAT_DLL_SOURCE)" "$(EXPAT_DLL_TARGET)"
+$(EXPAT_DLL_TARGET) : $(EXPAT_DLL_SOURCE)
+	copy $(EXPAT_DLL_SOURCE) $(EXPAT_DLL_TARGET)
 !else
 EXPAT_DEF= /D HAVE_EXPAT_H=0
 EXPAT_LIB=
@@ -159,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:
@@ -193,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)
@@ -225,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)
 
@@ -315,12 +322,14 @@ TSTFLOCK_OBJS= \
 
 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 \
@@ -363,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 \
@@ -409,6 +420,7 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\sortidx.obj \
 	$(OBJDIR)\states.obj \
 	$(OBJDIR)\stream.obj \
+	$(OBJDIR)\su_codec.obj \
 	$(OBJDIR)\symtab.obj \
 	$(OBJDIR)\trunc.obj \
 	$(OBJDIR)\untrans.obj \