X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=94dbb2064fc39c3b57ea97d0ecd18dd35f141c76;hb=ba1cf01240f69bcffc890b9f85b9a52ac56696f0;hp=7c23d63b197e8237741ac7458f53b9417ed7191a;hpb=11f210a8d94bd9d8470eccbfde96db834f9743bf;p=idzebra-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index 7c23d63..94dbb20 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # Zebra makefile for MS NMAKE
-# $Id: makefile,v 1.22 2003-02-28 14:34:21 adam Exp $
+# $Id: makefile,v 1.27 2004-08-06 12:27:30 adam Exp $
  
 ###########################################################
 ############### Parameters 
@@ -9,11 +9,11 @@ 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.4
+EXPAT_DIR= c:\Expat-1.95.7
 
 # iconv is optional
 HAVE_ICONV=1
-ICONV_DIR = c:\iconv-1.8.win32
+ICONV_DIR = c:\iconv-1.9.1.win32
 
 default: all
 
@@ -27,7 +27,7 @@ all: dirs zebralib zserver zindex
 ROOTDIR=..   # The home of zebra
 
 # YAZ include files, libraries, etc.
-YAZDIR=$(ROOTDIR)\..\YAZ
+YAZDIR=$(ROOTDIR)\..\YAZ-2.0.22
 YAZINCL=$(YAZDIR)\include
 YAZLIB=$(YAZDIR)\lib\yaz.lib
 YAZLIBS=$(YAZLIB)
@@ -214,11 +214,9 @@ APITEST_OBJS= \
 ZEBRALIB_OBJS= \
 	$(OBJDIR)\isam.obj \
 	$(OBJDIR)\isamc.obj \
-	$(OBJDIR)\isamd.obj \
 	$(OBJDIR)\isutil.obj \
 	$(OBJDIR)\memory.obj \
 	$(OBJDIR)\merge.obj \
-	$(OBJDIR)\merge-d.obj \
 	$(OBJDIR)\physical.obj \
 	$(OBJDIR)\rootblk.obj \
 	$(OBJDIR)\zebra-lock.obj \
@@ -227,6 +225,7 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\bset.obj \
 	$(OBJDIR)\cfile.obj \
 	$(OBJDIR)\charmap.obj \
+	$(OBJDIR)\atoi_zn.obj \
 	$(OBJDIR)\close.obj \
 	$(OBJDIR)\commit.obj \
 	$(OBJDIR)\compact.obj \
@@ -253,6 +252,7 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\passwddb.obj \
 	$(OBJDIR)\zvrank.obj \
 	$(OBJDIR)\rank1.obj \
+	$(OBJDIR)\livcode.obj \
 	$(OBJDIR)\readfile.obj \
 	$(OBJDIR)\recctrl.obj \
 	$(OBJDIR)\recgrs.obj \
@@ -261,6 +261,7 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\rectext.obj \
 	$(OBJDIR)\regxread.obj \
 	$(OBJDIR)\xmlread.obj \
+	$(OBJDIR)\danbibr.obj \
 	$(OBJDIR)\res.obj \
 	$(OBJDIR)\retrieve.obj \
 	$(OBJDIR)\rsbool.obj \
@@ -287,6 +288,7 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\rsisamd.obj \
 	$(OBJDIR)\rsisamb.obj \
 	$(OBJDIR)\rsbetween.obj \
+	$(OBJDIR)\rsprox.obj \
 	$(OBJDIR)\dir.obj \
 	$(OBJDIR)\dirs.obj \
 	$(OBJDIR)\extract.obj \