X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fmakefile;h=9ee200bed3d92bedae3df7acb4c67a9b5015307a;hb=f4adf254279a4fd165a18a77c8d4ee48a71eb24a;hp=be4e2c84f506524aff4c974662da0961183edbd1;hpb=6d9e8305bb173398dc9b886070a72b40618304ca;p=yaz-moved-to-github.git

diff --git a/win/makefile b/win/makefile
index be4e2c8..9ee200b 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,6 +1,6 @@
-# Copyright (C) 1994-2003, Index Data
+# Copyright (C) 1994-2004, Index Data
 # All rights reserved.
-# $Id: makefile,v 1.69 2004-01-12 12:11:58 adam Exp $
+# $Id: makefile,v 1.76 2004-03-19 20:57:44 adam Exp $
 #
 # Programmed by
 #  HL: Heikki Levanto, Index Data
@@ -19,13 +19,16 @@ HAVE_TCL=1
 
 # iconv charcter conversion utility
 HAVE_ICONV=1
-ICONV_DIR = c:\iconv-1.8.win32
+ICONV_DIR = c:\iconv-1.9.1.win32
 
 # libxml2
 HAVE_LIBXML2=1
-LIBXML2_DIR=c:\libxml2-2.5.10.win32
+LIBXML2_DIR=c:\libxml2-2.6.7.win32
 
-# WIN32 binaries libxml2 & iconv from here:
+# zlib compression (used by libxml2)
+ZLIB_DIR = c:\zlib-1.1.4.win32
+
+# get WIN32 binaries libxml2 & iconv & zlib from here:
 #  http://www.zlatkovic.com/projects/libxml/binaries.html
 
 # bison
@@ -127,10 +130,14 @@ iconv:
 !if $(HAVE_LIBXML2)
 LIBXML2_LIB="$(LIBXML2_DIR)\lib\libxml2.lib"
 LIBXML2_DEF=/D HAVE_XML2=1 /I"$(LIBXML2_DIR)\include"
-libxml2: $(BINDIR)\libxml2.dll
+libxml2: $(BINDIR)\libxml2.dll $(BINDIR)\zlib.dll
 
 $(BINDIR)\libxml2.dll:
   copy "$(LIBXML2_DIR)\lib\libxml2.dll" $(BINDIR)
+
+$(BINDIR)\zlib.dll:
+  copy "$(ZLIB_DIR)\lib\zlib.dll" $(BINDIR)
+
 !else
 LIBXML2_LIB=
 LIBXML2_DEF=/D HAVE_XML2=0
@@ -613,9 +620,9 @@ $(ITEM_REQ_FILES): $(SRCDIR)\item-req.asn
 	$(TCL) $(TCLOPT) -d ill.tcl item-req.asn
 	@cd $(WINDIR)
 
-$(SRCDIR)\marc8.c: $(SRCDIR)\charconv.sgm
+$(SRCDIR)\marc8.c: $(SRCDIR)\charconv.sgm $(SRCDIR)\codetables.xml $(SRCDIR)\charconv.tcl
 	@cd $(SRCDIR)
-	$(TCL) charconv.tcl -p marc8 -s 50 charconv.sgm -o marc8.c
+	$(TCL) charconv.tcl -O 1 -p marc8 charconv.sgm codetables.xml -o marc8.c
 
 !endif