X-Git-Url: http://git.indexdata.com/?p=yazproxy-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=aff8420d29fac026af95c663725aec2755613b4f;hp=00de38542cb275cedd716851761b266108f95700;hb=59ff238376a0cb923b3e988d1601bb60bc9d4be2;hpb=b59c18b37ff528f75a8a6f0eb9d6e8f0bf05f534

diff --git a/win/makefile b/win/makefile
index 00de385..aff8420 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,12 +1,11 @@
-# Copyright (C) 1999-2006, Index Data ApS
+# Copyright (C) 1998-2008 Index Data
 # All rights reserved.
-# $Id: makefile,v 1.8 2006-04-30 14:09:31 adam Exp $
 
 ###########################################################
 ############### Parameters 
 ###########################################################
 
-DEBUG=1   # 0 for release, 1 for debug
+DEBUG=0   # 0 for release, 1 for debug
 
 # YAZ and YAZ++
 YAZ_DIR=..\..\yaz
@@ -14,18 +13,18 @@ YAZPP_DIR=..\..\yazpp
 
 # iconv charcter conversion utility
 HAVE_ICONV=1
-ICONV_DIR = c:\iconv-1.9.1.win32
+ICONV_DIR=\iconv-1.9.2.win32
 
 # libxslt
 HAVE_LIBXSLT=1
-LIBXSLT_DIR=c:\libxslt-1.1.14.win32
+LIBXSLT_DIR=\libxslt-1.1.23+.win32
 
 # libxml2 (used by libxslt)
 HAVE_LIBXML2=1
-LIBXML2_DIR=c:\libxml2-2.6.20.win32
+LIBXML2_DIR=\libxml2-2.6.32+.win32
 
 # zlib compression (used by libxml2)
-ZLIB_DIR = c:\zlib-1.2.3.win32
+ZLIB_DIR=\zlib-1.2.3.win32
 
 # get WIN32 binaries for libxslt, libxml, iconv, zlib from here:
 # http://www.zlatkovic.com/libxml.en.html
@@ -63,8 +62,8 @@ OBJDIR=$(WINDIR)\obj        # where we store intermediate files
 TMPDIR=$(ROOTDIR)\win\tmp
 TMP=$(TMPDIR)
 
-YAZPROXY_DLL=$(BINDIR)\yazproxy.dll
-YAZPROXY_IMPLIB=$(LIBDIR)\yazproxy.lib
+YAZPROXY_DLL=$(BINDIR)\yazproxy2.dll
+YAZPROXY_IMPLIB=$(LIBDIR)\yazproxy2.lib
 
 YAZPROXY=$(BINDIR)\yazproxy.exe
 
@@ -73,20 +72,20 @@ dll: $(YAZPROXY_DLL)
 proxy: $(YAZPROXY)
 
 !if $(DEBUG)
-YAZD=yazd
-YAZPPD=yazpp_1_d
+YAZD=yaz3d
+YAZPPD=yazpp3d
 !else
-YAZD=yaz
-YAZPPD=yazpp_1
+YAZD=yaz3
+YAZPPD=yazpp3
 !endif
 
 # YAZ includes & libs
 YAZ_LIB="$(YAZ_DIR)\lib\$(YAZD).lib"
-YAZ_DEF=/DYAZ_USE_NEW_LOG=1 /I"$(YAZ_DIR)\include"
+YAZ_DEF=/DYAZ_HAVE_XML2=1 /DYAZ_USE_NEW_LOG=1 /I"$(YAZ_DIR)\include"
 
 # Copy yaz.dll to our bin
 yaz: $(BINDIR)\$(YAZD).dll
-$(BINDIR)\$(YAZD).dll: $(YAZ_DIR)\bin\$(YAZD).dll
+$(BINDIR)\$(YAZD).dll: "$(YAZ_DIR)\bin\$(YAZD).dll"
   copy "$(YAZ_DIR)\bin\$(YAZD).dll" $(BINDIR)
 
 # YAZ++ includes & libs
@@ -95,7 +94,7 @@ YAZPP_DEF=/I"$(YAZPP_DIR)\include"
 
 # Copy yazpp.dll to our bin
 yazpp: $(BINDIR)\$(YAZPPD).dll
-$(BINDIR)\$(YAZPPD).dll: $(YAZPP_DIR)\bin\$(YAZPPD).dll
+$(BINDIR)\$(YAZPPD).dll: "$(YAZPP_DIR)\bin\$(YAZPPD).dll"
   copy "$(YAZPP_DIR)\bin\$(YAZPPD).dll" $(BINDIR)
 
 !if $(HAVE_ICONV)
@@ -136,7 +135,7 @@ libxml2:
 
 !if $(HAVE_LIBXSLT)
 LIBXSLT_LIB="$(LIBXSLT_DIR)\lib\libxslt.lib"
-LIBXSLT_DEF=/D HAVE_XSLT=1 /I"$(LIBXSLT_DIR)\include"
+LIBXSLT_DEF=/D YAZ_HAVE_XSLT=1 /I"$(LIBXSLT_DIR)\include"
 libxslt: $(BINDIR)\libxslt.dll $(BINDIR)\zlib1.dll
 
 $(BINDIR)\libxslt.dll:
@@ -144,7 +143,7 @@ $(BINDIR)\libxslt.dll:
 
 !else
 LIBXSLT_LIB=
-LIBXSLT_DEF=/D HAVE_XSLT=0
+LIBXSLT_DEF=/D YAZ_HAVE_XSLT=0
 libxslt: 
 
 !endif
@@ -199,8 +198,7 @@ RELEASE_C_OPTIONS=  \
 ### Linker options
 LINK=link.exe
 
-LINK_LIBS=kernel32.lib user32.lib gdi32.lib advapi32.lib uuid.lib \
-          wsock32.lib  advapi32.lib \
+LINK_LIBS=kernel32.lib advapi32.lib ws2_32.lib \
            $(YAZ_LIB) $(YAZPP_LIB) $(ICONV_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB)
 
 COMMON_LNK_OPTIONS=\