Cookie handling; deal with relative URI in Location YAZ-719

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

diff --git a/win/makefile b/win/makefile
index 6204044..2b9ae83 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # This file is part of the YAZ toolkit.
-# Copyright (C) 1995-2013 Index Data
+# Copyright (C) Index Data
 
 # Parameters 
 
@@ -110,19 +110,19 @@ TESTDIR=$(ROOTDIR)\TEST
 # 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,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 \
@@ -451,6 +450,7 @@ MISC_OBJS= \
    $(OBJDIR)\atoin.obj \
    $(OBJDIR)\log.obj \
    $(OBJDIR)\marcdisp.obj \
+   $(OBJDIR)\marc_read_json.obj \
    $(OBJDIR)\marc_read_xml.obj \
    $(OBJDIR)\marc_read_iso2709.obj \
    $(OBJDIR)\marc_read_line.obj \
@@ -490,11 +490,14 @@ MISC_OBJS= \
    $(OBJDIR)\charneg.obj \
    $(OBJDIR)\grs1disp.obj \
    $(OBJDIR)\opac_to_xml.obj \
+   $(OBJDIR)\xml_add.obj \
+   $(OBJDIR)\xml_match.obj \
    $(OBJDIR)\xml_to_opac.obj \
    $(OBJDIR)\zgdu.obj \
    $(OBJDIR)\soap.obj \
    $(OBJDIR)\solr.obj \
    $(OBJDIR)\solrtransform.obj \
+   $(OBJDIR)\sru_facet.obj \
    $(OBJDIR)\srw.obj \
    $(OBJDIR)\srwutil.obj \
    $(OBJDIR)\zoom-c.obj \
@@ -512,6 +515,7 @@ MISC_OBJS= \
    $(OBJDIR)\xmlquery.obj \
    $(OBJDIR)\xmlerror.obj \
    $(OBJDIR)\mime.obj \
+   $(OBJDIR)\cookie.obj \
    $(OBJDIR)\cql.obj \
    $(OBJDIR)\cql2ccl.obj \
    $(OBJDIR)\cql_sortkeys.obj \
@@ -533,6 +537,7 @@ MISC_OBJS= \
    $(OBJDIR)\match_glob.obj \
    $(OBJDIR)\poll.obj \
    $(OBJDIR)\daemon.obj \
+   $(OBJDIR)\iconv_encode_danmarc.obj \
    $(OBJDIR)\iconv_encode_iso_8859_1.obj \
    $(OBJDIR)\iconv_encode_marc8.obj \
    $(OBJDIR)\iconv_decode_marc8.obj \