X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=c1ecf4147d1f8ed1919d18118f5a27a4673be9a4;hb=d950c3e047f4ba482b7f36d7e81faae6d4b5dacb;hp=73781849cd9471166873e718a4c8347f545749d1;hpb=bcdea3c551bcbbbb94d69fbea014f26c85ff7ef7;p=yaz-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index 7378184..c1ecf41 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,6 +1,6 @@
 # Copyright (C) 1994-2005, Index Data ApS
 # All rights reserved.
-# $Id: makefile,v 1.89 2005-01-16 00:16:56 adam Exp $
+# $Id: makefile,v 1.95 2005-08-18 18:42:37 adam Exp $
 #
 # Programmed by
 #  Heikki Levanto & Adam Dickmeiss
@@ -22,10 +22,10 @@ ICONV_DIR = c:\iconv-1.9.1.win32
 
 # libxml2
 HAVE_LIBXML2=1
-LIBXML2_DIR=c:\libxml2-2.6.15.win32
+LIBXML2_DIR=c:\libxml2-2.6.20.win32
 
 # zlib compression (used by libxml2)
-ZLIB_DIR = c:\zlib-1.2.1.win32
+ZLIB_DIR = c:\zlib-1.2.3.win32
 
 # get WIN32 binaries libxml2 & iconv & zlib from here:
 #  http://www.zlatkovic.com/libxml.en.html
@@ -134,7 +134,7 @@ ICONV_LIB= \
 iconv: $(BINDIR)\iconv.dll
 
 $(BINDIR)\iconv.dll:
-  copy "$(ICONV_DIR)\lib\iconv.dll" $(BINDIR)
+  copy "$(ICONV_DIR)\bin\iconv.dll" $(BINDIR)
 !else
 ICONV_DEF= \
   /D HAVE_ICONV_H=0
@@ -360,6 +360,7 @@ YAZ_UTIL_OBJS= \
 YAZ_ZUTIL_OBJS= \
    $(OBJDIR)\diagbib1.obj \
    $(OBJDIR)\diagsrw.obj \
+   $(OBJDIR)\diag-entry.obj \
    $(OBJDIR)\zget.obj \
    $(OBJDIR)\logrpn.obj \
    $(OBJDIR)\pquery.obj \
@@ -640,6 +641,14 @@ $(SRCDIR)\marc8.c: $(SRCDIR)\codetables.xml $(SRCDIR)\charconv.tcl
 	@cd $(SRCDIR)
 	$(TCL) charconv.tcl -p marc8 codetables.xml -o marc8.c
 
+$(SRCDIR)\diagbib1.c: $(SRCDIR)\bib1.csv
+	@cd $(SRCDIR)
+	$(TCL) csvtobib1.tcl
+
+$(SRCDIR)\diagsrw.c: $(SRCDIR)\srw.csv
+	@cd $(SRCDIR)
+	$(TCL) csvtosrw.tcl
+
 !endif
 
 !if $(HAVE_BISON)