Pass /manifest option always YAZ-804

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

diff --git a/win/makefile b/win/makefile
index eaabe22..8ad37b2 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -7,8 +7,8 @@ DEBUG=0   # 0 for release, 1 for debug
 USE_MANIFEST = 1
 
 # TCL
-TCL="C:\Tcl\bin\tclsh85.exe"
-#TCL="C:\Program Files\Tcl\bin\tclsh83.exe"
+TCL=tclsh
+#TCL="C:\Tcl\bin\tclsh85.exe"
 HAVE_TCL=1
 
 # iconv charcter conversion utility
@@ -190,19 +190,22 @@ iconv:
 !endif
 
 !if $(HAVE_ICU)
-ICU_DEF=
+ICU_DEF= \
   /D YAZ_HAVE_ICU=1 /D HAVE_ICU_H=1 /I"$(ICU_INCLUDE)"
+ICU_VER=42
 ICU_LIBS= \
   $(ICU_LIB)\icudt.lib $(ICU_LIB)\icuin.lib $(ICU_LIB)\icuuc.lib
-icu: $(BINDIR)\icudt42.dll $(BINDIR)\icuin42.dll $(BINDIR)\icuuc42.dll
+icu: $(BINDIR)\icudt$(ICU_VER).dll \
+       $(BINDIR)\icuin$(ICU_VER).dll \
+       $(BINDIR)\icuuc$(ICU_VER).dll
 yazicu: dirs generate $(YAZ_ICU)
 
-$(BINDIR)\icudt42.dll:
-  copy "$(ICU_BIN)\icudt42.dll" $(BINDIR)
-$(BINDIR)\icuin42.dll:
-  copy "$(ICU_BIN)\icuin42.dll" $(BINDIR)
-$(BINDIR)\icuuc42.dll:
-  copy "$(ICU_BIN)\icuuc42.dll" $(BINDIR)
+$(BINDIR)\icudt$(ICU_VER).dll:
+  copy "$(ICU_BIN)\icudt$(ICU_VER).dll" $(BINDIR)
+$(BINDIR)\icuin$(ICU_VER).dll:
+  copy "$(ICU_BIN)\icuin$(ICU_VER).dll" $(BINDIR)
+$(BINDIR)\icuuc$(ICU_VER).dll:
+  copy "$(ICU_BIN)\icuuc$(ICU_VER).dll" $(BINDIR)
 !else
 ICU_DEF= /D YAZ_HAVE_ICU=0
 ICU_LIBS=
@@ -299,7 +302,7 @@ MT=echo
 LINK_LIBS= kernel32.lib ws2_32.lib advapi32.lib \
           $(ICONV_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB)
 
-COMMON_LNK_OPTIONS= /nologo /subsystem:windows /incremental:no
+COMMON_LNK_OPTIONS= /nologo /subsystem:windows /incremental:no /manifest
 
 DEBUG_LNK_OPTIONS= /debug
 
@@ -457,6 +460,7 @@ MISC_OBJS= \
    $(OBJDIR)\readconf.obj \
    $(OBJDIR)\tpath.obj \
    $(OBJDIR)\wrbuf.obj \
+   $(OBJDIR)\wrbuf_sha1.obj \
    $(OBJDIR)\xmalloc.obj \
    $(OBJDIR)\matchstr.obj \
    $(OBJDIR)\siconv.obj \
@@ -497,6 +501,7 @@ MISC_OBJS= \
    $(OBJDIR)\srwutil.obj \
    $(OBJDIR)\zoom-c.obj \
    $(OBJDIR)\zoom-event.obj \
+   $(OBJDIR)\zoom-memcached.obj \
    $(OBJDIR)\zoom-record-cache.obj \
    $(OBJDIR)\zoom-z3950.obj \
    $(OBJDIR)\zoom-sru.obj \
@@ -507,6 +512,7 @@ MISC_OBJS= \
    $(OBJDIR)\zoom-socket.obj \
    $(OBJDIR)\initopt.obj \
    $(OBJDIR)\init_diag.obj \
+   $(OBJDIR)\init_globals.obj \
    $(OBJDIR)\xmlquery.obj \
    $(OBJDIR)\xmlerror.obj \
    $(OBJDIR)\mime.obj \
@@ -549,7 +555,8 @@ MISC_OBJS= \
    $(OBJDIR)\file_glob.obj \
    $(OBJDIR)\thread_id.obj \
    $(OBJDIR)\dirent.obj \
-   $(OBJDIR)\url.obj
+   $(OBJDIR)\url.obj \
+   $(OBJDIR)\backtrace.obj
 
 Z3950_OBJS= \
    $(OBJDIR)\z-date.obj\
@@ -856,11 +863,11 @@ $(SRCDIR)\oid_std.c: $(SRCDIR)\oid.csv
 
 $(SRCDIR)\diagbib1.c: $(SRCDIR)\bib1.csv
        @cd $(SRCDIR)
-       $(TCL) csvtobib1.tcl $(SRCDIR)
+       $(TCL) csvtodiag.tcl bib1.csv diagbib1.c $(INCLDIR)\yaz\diagbib1.h bib1 diagbib1_str
 
 $(SRCDIR)\diagsrw.c: $(SRCDIR)\srw.csv
        @cd $(SRCDIR)
-       $(TCL) csvtosrw.tcl $(SRCDIR)
+       $(TCL) csvtodiag.tcl srw.csv diagsrw.c $(INCLDIR)\yaz\diagsrw.h srw
 
 $(SRCDIR)\diagsru_update.c: $(SRCDIR)\sru_update.csv
        @cd $(SRCDIR)
@@ -876,7 +883,7 @@ $(INCLDIR)\yaz\yaz-version.h: $(ROOTDIR)/IDMETA
 !if $(HAVE_BISON)
 $(SRCDIR)\cql.c: $(SRCDIR)\cql.y
        @cd $(SRCDIR)
-       $(BISON) -y -o cql.c cql.y
+       $(BISON) -y -p cql_ -o cql.c cql.y
 
 !endif