X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=2d9eb4793900259d8191c0a49bb309c9ab982e17;hb=9d9266bfed4daa001a3f038f0d5b6e8c51a37373;hp=9494c77bc4561db4a3d16072075d5169809a8bf8;hpb=ce9fb839e550a3d807c4c25bf46b79d745313bc2;p=idzebra-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index 9494c77..2d9eb47 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # Zebra makefile for MS NMAKE
-# $Id: makefile,v 1.53 2006-07-05 13:19:15 adam Exp $
+# $Id: makefile,v 1.55 2006-08-22 13:39:28 adam Exp $
  
 ###########################################################
 ############### Parameters 
@@ -13,15 +13,15 @@ EXPAT_DIR=c:\Expat-1.95.8
 
 # iconv is optional
 HAVE_ICONV=1
-ICONV_DIR=c:\iconv-1.9.1.win32
+ICONV_DIR=c:\iconv-1.9.2.win32
 
 # libxslt. For alvis
 HAVE_LIBXSLT=1
-LIBXSLT_DIR=c:\libxslt-1.1.14.win32
+LIBXSLT_DIR=c:\libxslt-1.1.17.win32
 
 # libxml2. Used by libxslt
 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
@@ -340,6 +340,7 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\d1_sumout.obj \
 	$(OBJDIR)\d1_sutrs.obj \
 	$(OBJDIR)\d1_tagset.obj \
+	$(OBJDIR)\d1_utils.obj \
 	$(OBJDIR)\d1_varset.obj \
 	$(OBJDIR)\d1_write.obj \
 	$(OBJDIR)\dclose.obj \
@@ -352,6 +353,7 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\dopen.obj \
 	$(OBJDIR)\drdwr.obj \
 	$(OBJDIR)\extract.obj \
+	$(OBJDIR)\flock.obj \
 	$(OBJDIR)\imalloc.obj \
 	$(OBJDIR)\inline.obj \
 	$(OBJDIR)\insert.obj \
@@ -363,7 +365,6 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\kcontrol.obj \
 	$(OBJDIR)\kinput.obj \
 	$(OBJDIR)\limit.obj \
-	$(OBJDIR)\flock.obj \
 	$(OBJDIR)\lookgrep.obj \
 	$(OBJDIR)\lookup.obj \
 	$(OBJDIR)\lookupec.obj \
@@ -403,10 +404,11 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\snippet.obj \
 	$(OBJDIR)\sortidx.obj \
 	$(OBJDIR)\states.obj \
+	$(OBJDIR)\stream.obj \
 	$(OBJDIR)\symtab.obj \
+	$(OBJDIR)\trunc.obj \
 	$(OBJDIR)\update_path.obj \
 	$(OBJDIR)\update_file.obj \
-	$(OBJDIR)\trunc.obj \
 	$(OBJDIR)\xmlread.obj \
 	$(OBJDIR)\xpath.obj \
 	$(OBJDIR)\zebra-lock.obj \
@@ -497,7 +499,7 @@ $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR):
 yaz: $(YAZ_DLL_TARGET)
 
 $(YAZ_DLL_TARGET) : $(YAZ_DLL_SOURCE)
-	copy $(YAZBINDIR)\*.dll.manifest $(BINDIR)
+#	copy $(YAZBINDIR)\*.dll.manifest $(BINDIR)
 	copy $(YAZBINDIR)\*.dll $(BINDIR)