Using yazpp3.

[yazproxy-moved-to-github.git] / win / makefile

diff --git a/win/makefile b/win/makefile
index 00de385..0664be3 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -1,12 +1,12 @@
 # Copyright (C) 1999-2006, Index Data ApS
 # All rights reserved.
 # Copyright (C) 1999-2006, Index Data ApS
 # All rights reserved.

-# $Id: makefile,v 1.8 2006-04-30 14:09:31 adam Exp $
+# $Id: makefile,v 1.14 2008-02-21 10:16:51 adam Exp $

 
 ###########################################################
 ############### Parameters 
 ###########################################################
 
 
 ###########################################################
 ############### Parameters 
 ###########################################################
 

-DEBUG=1   # 0 for release, 1 for debug
+DEBUG=0   # 0 for release, 1 for debug

 
 # YAZ and YAZ++
 YAZ_DIR=..\..\yaz
 
 # YAZ and YAZ++
 YAZ_DIR=..\..\yaz

@@ -14,18 +14,18 @@ YAZPP_DIR=..\..\yazpp
 
 # iconv charcter conversion utility
 HAVE_ICONV=1
 
 # 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
 HAVE_LIBXSLT=1

-LIBXSLT_DIR=c:\libxslt-1.1.14.win32
+LIBXSLT_DIR=\libxslt-1.1.19.win32

 
 # libxml2 (used by libxslt)
 HAVE_LIBXML2=1
 
 # libxml2 (used by libxslt)
 HAVE_LIBXML2=1

-LIBXML2_DIR=c:\libxml2-2.6.20.win32
+LIBXML2_DIR=\libxml2-2.6.28.win32

 
 # zlib compression (used by libxml2)
 
 # 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
 
 # get WIN32 binaries for libxslt, libxml, iconv, zlib from here:
 # http://www.zlatkovic.com/libxml.en.html

@@ -63,8 +63,8 @@ OBJDIR=$(WINDIR)\obj        # where we store intermediate files
 TMPDIR=$(ROOTDIR)\win\tmp
 TMP=$(TMPDIR)
 
 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
 
 
 YAZPROXY=$(BINDIR)\yazproxy.exe
 

@@ -73,20 +73,20 @@ dll: $(YAZPROXY_DLL)
 proxy: $(YAZPROXY)
 
 !if $(DEBUG)
 proxy: $(YAZPROXY)
 
 !if $(DEBUG)

-YAZD=yazd
-YAZPPD=yazpp_1_d
+YAZD=yaz3d
+YAZPPD=yazpp3d

 !else
 !else

-YAZD=yaz
-YAZPPD=yazpp_1
+YAZD=yaz3
+YAZPPD=yazpp3

 !endif
 
 # YAZ includes & libs
 YAZ_LIB="$(YAZ_DIR)\lib\$(YAZD).lib"
 !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
 
 # 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
   copy "$(YAZ_DIR)\bin\$(YAZD).dll" $(BINDIR)
 
 # YAZ++ includes & libs

@@ -95,7 +95,7 @@ YAZPP_DEF=/I"$(YAZPP_DIR)\include"
 
 # Copy yazpp.dll to our bin
 yazpp: $(BINDIR)\$(YAZPPD).dll
 
 # 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)
   copy "$(YAZPP_DIR)\bin\$(YAZPPD).dll" $(BINDIR)
 
 !if $(HAVE_ICONV)

@@ -136,7 +136,7 @@ libxml2:
 
 !if $(HAVE_LIBXSLT)
 LIBXSLT_LIB="$(LIBXSLT_DIR)\lib\libxslt.lib"
 
 !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:
 libxslt: $(BINDIR)\libxslt.dll $(BINDIR)\zlib1.dll
 
 $(BINDIR)\libxslt.dll:

@@ -144,7 +144,7 @@ $(BINDIR)\libxslt.dll:
 
 !else
 LIBXSLT_LIB=
 
 !else
 LIBXSLT_LIB=

-LIBXSLT_DEF=/D HAVE_XSLT=0
+LIBXSLT_DEF=/D YAZ_HAVE_XSLT=0

 libxslt: 
 
 !endif
 libxslt: 
 
 !endif