From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 1 Oct 2013 13:19:59 +0000 (+0200)
Subject: Merge branch 'sru_2_0' of ssh://git.indexdata.com/home/git/pub/yaz into sru_2_0
X-Git-Tag: v5.0.0~1
X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=41fffe7a22f77d15b5d0214079e11ad62fdb2ca9;hp=-c

Merge branch 'sru_2_0' of ssh://git.indexdata.com/home/git/pub/yaz into sru_2_0
---

41fffe7a22f77d15b5d0214079e11ad62fdb2ca9
diff --combined win/makefile
index f38f36f,1f73065..3b9cf54
--- a/win/makefile
+++ b/win/makefile
@@@ -110,19 -110,19 +110,19 @@@ TESTDIR=$(ROOTDIR)\TES
  # Targets - what to make
  
  !if $(DEBUG)
- YAZ_DLL=$(BINDIR)\yaz4d.dll
- YAZ_IMPLIB=$(LIBDIR)\yaz4d.lib
- YAZ_ICU_DLL=$(BINDIR)\yaz_icu4d.dll
- YAZ_ICU_IMPLIB=$(LIBDIR)\yaz_icu4d.lib
- YAZ_COND_DLL=$(BINDIR)\yaz_cond4d.dll
- YAZ_COND_IMPLIB=$(LIBDIR)\yaz_cond4d.lib
+ YAZ_DLL=$(BINDIR)\yaz5d.dll
+ YAZ_IMPLIB=$(LIBDIR)\yaz5d.lib
+ YAZ_ICU_DLL=$(BINDIR)\yaz_icu5d.dll
+ YAZ_ICU_IMPLIB=$(LIBDIR)\yaz_icu5d.lib
+ YAZ_COND_DLL=$(BINDIR)\yaz_cond5d.dll
+ YAZ_COND_IMPLIB=$(LIBDIR)\yaz_cond5d.lib
  !else
- YAZ_DLL=$(BINDIR)\yaz4.dll
- YAZ_IMPLIB=$(LIBDIR)\yaz4.lib
- YAZ_ICU_DLL=$(BINDIR)\yaz_icu4.dll
- YAZ_ICU_IMPLIB=$(LIBDIR)\yaz_icu4.lib
- YAZ_COND_DLL=$(BINDIR)\yaz_cond4.dll
- YAZ_COND_IMPLIB=$(LIBDIR)\yaz_cond4.lib
+ YAZ_DLL=$(BINDIR)\yaz5.dll
+ YAZ_IMPLIB=$(LIBDIR)\yaz5.lib
+ YAZ_ICU_DLL=$(BINDIR)\yaz_icu5.dll
+ YAZ_ICU_IMPLIB=$(LIBDIR)\yaz_icu5.lib
+ YAZ_COND_DLL=$(BINDIR)\yaz_cond5.dll
+ YAZ_COND_IMPLIB=$(LIBDIR)\yaz_cond5.lib
  !endif
  
  CLIENT=$(BINDIR)\yaz-client.exe
@@@ -420,6 -420,7 +420,6 @@@ MISC_OBJS= 
     $(OBJDIR)\ccl_stop_words.obj \
     $(OBJDIR)\comstack.obj \
     $(OBJDIR)\tcpip.obj \
 -   $(OBJDIR)\waislen.obj \
     $(OBJDIR)\ber_any.obj \
     $(OBJDIR)\ber_bit.obj \
     $(OBJDIR)\ber_bool.obj \