Bug fix: Handle the case where an APDU can be decoded but not encoded.

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

diff --git a/win/makefile b/win/makefile
index be510c9..2156e44 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -1,6 +1,6 @@
-# Copyright (C) 1993-2004, Index Data ApS
+# Copyright (C) 1993-2006, Index Data ApS

 # All rights reserved.
 # All rights reserved.

-# $Id: makefile,v 1.1 2004-04-11 17:49:53 adam Exp $
+# $Id: makefile,v 1.5 2006-03-30 14:16:34 adam Exp $

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

@@ -9,8 +9,8 @@
 DEBUG=0   # 0 for release, 1 for debug
 
 # YAZ and YAZ++
 DEBUG=0   # 0 for release, 1 for debug
 
 # YAZ and YAZ++

-YAZ_DIR=c:\yaz
-YAZPP_DIR=c:\yaz++
+YAZ_DIR=..\..\yaz
+YAZPP_DIR=..\..\yazpp

 
 # iconv charcter conversion utility
 HAVE_ICONV=1
 
 # iconv charcter conversion utility
 HAVE_ICONV=1

@@ -18,14 +18,14 @@ ICONV_DIR = c:\iconv-1.9.1.win32
 
 # libxslt
 HAVE_LIBXSLT=1
 
 # libxslt
 HAVE_LIBXSLT=1

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

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

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

 
 # zlib compression (used by libxml2)
 
 # zlib compression (used by libxml2)

-ZLIB_DIR = c:\zlib-1.1.4.win32
+ZLIB_DIR = c:\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

@@ -102,7 +102,7 @@ ICONV_LIB= \
 iconv: $(BINDIR)\iconv.dll
 
 $(BINDIR)\iconv.dll:
 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
 !else
 ICONV_DEF= \
   /D HAVE_ICONV_H=0

@@ -114,13 +114,13 @@ iconv:
 !if $(HAVE_LIBXML2)
 LIBXML2_LIB="$(LIBXML2_DIR)\lib\libxml2.lib"
 LIBXML2_DEF=/D HAVE_XML2=1 /I"$(LIBXML2_DIR)\include"
 !if $(HAVE_LIBXML2)
 LIBXML2_LIB="$(LIBXML2_DIR)\lib\libxml2.lib"
 LIBXML2_DEF=/D HAVE_XML2=1 /I"$(LIBXML2_DIR)\include"

-libxml2: $(BINDIR)\libxml2.dll $(BINDIR)\zlib.dll
+libxml2: $(BINDIR)\libxml2.dll $(BINDIR)\zlib1.dll

 
 $(BINDIR)\libxml2.dll:
 
 $(BINDIR)\libxml2.dll:

-  copy "$(LIBXML2_DIR)\lib\libxml2.dll" $(BINDIR)
+  copy "$(LIBXML2_DIR)\bin\libxml2.dll" $(BINDIR)

 
 

-$(BINDIR)\zlib.dll:
-  copy "$(ZLIB_DIR)\lib\zlib.dll" $(BINDIR)
+$(BINDIR)\zlib1.dll:
+  copy "$(ZLIB_DIR)\bin\zlib1.dll" $(BINDIR)

 
 !else
 LIBXML2_LIB=
 
 !else
 LIBXML2_LIB=

@@ -132,10 +132,10 @@ libxml2:
 !if $(HAVE_LIBXSLT)
 LIBXSLT_LIB="$(LIBXSLT_DIR)\lib\libxslt.lib"
 LIBXSLT_DEF=/D HAVE_XSLT=1 /I"$(LIBXSLT_DIR)\include"
 !if $(HAVE_LIBXSLT)
 LIBXSLT_LIB="$(LIBXSLT_DIR)\lib\libxslt.lib"
 LIBXSLT_DEF=/D HAVE_XSLT=1 /I"$(LIBXSLT_DIR)\include"

-libxslt: $(BINDIR)\libxslt.dll $(BINDIR)\zlib.dll
+libxslt: $(BINDIR)\libxslt.dll $(BINDIR)\zlib1.dll

 
 $(BINDIR)\libxslt.dll:
 
 $(BINDIR)\libxslt.dll:

-  copy "$(LIBXSLT_DIR)\lib\libxslt.dll" $(BINDIR)
+  copy "$(LIBXSLT_DIR)\bin\libxslt.dll" $(BINDIR)

 
 !else
 LIBXSLT_LIB=
 
 !else
 LIBXSLT_LIB=

@@ -237,6 +237,11 @@ YAZPROXY_OBJS= \
 YAZPROXY_DLL_OBJS = \
    "$(OBJDIR)\yaz-proxy.obj" \
    "$(OBJDIR)\yaz-proxy-config.obj" \
 YAZPROXY_DLL_OBJS = \
    "$(OBJDIR)\yaz-proxy.obj" \
    "$(OBJDIR)\yaz-proxy-config.obj" \

+   "$(OBJDIR)\yaz-usemarcon.obj" \
+   "$(OBJDIR)\msg-thread.obj" \
+   "$(OBJDIR)\charset-converter.obj" \
+   "$(OBJDIR)\limit-connect.obj" \
+   "$(OBJDIR)\modules.obj" \

    "$(OBJDIR)\yaz-bw.obj"
 
 ###########################################################
    "$(OBJDIR)\yaz-bw.obj"
 
 ###########################################################

@@ -315,7 +320,6 @@ clean:
        -del $(OBJDIR)\*.OBJ
 
 realclean: clean
        -del $(OBJDIR)\*.OBJ
 
 realclean: clean

-       -del $(ZOOMDIR)\zoom.h

 
 # Because DOS del will only accept one file name to delete,
 # the _H_ files work only on sets that have just one file.
 
 # Because DOS del will only accept one file name to delete,
 # the _H_ files work only on sets that have just one file.