Use mk_version.tcl to generate yaz-version.h

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

diff --git a/win/makefile b/win/makefile
index 9de4ef9..3137e98 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -10,7 +10,7 @@ DEBUG=0   # 0 for release, 1 for debug
 USE_MANIFEST = 0
 
 # TCL
-TCL="C:\Tcl\bin\tclsh84.exe"
+TCL="C:\Tcl\bin\tclsh85.exe"
 #TCL="C:\Program Files\Tcl\bin\tclsh83.exe"
 HAVE_TCL=1
 
@@ -25,11 +25,11 @@ ICU_DIR = c:\icu
 
 # libxslt
 HAVE_LIBXSLT=1
-LIBXSLT_DIR=c:\libxslt-1.1.19.win32
+LIBXSLT_DIR=c:\libxslt-1.1.24.win32
 
 # libxml2
 HAVE_LIBXML2=1
-LIBXML2_DIR=c:\libxml2-2.6.28.win32
+LIBXML2_DIR=c:\libxml2-2.7.1.win32
 
 # zlib compression (used by libxml2)
 ZLIB_DIR = c:\zlib-1.2.3.win32
@@ -60,8 +60,6 @@ nsis:
 nsishelp:
        $(NSIS)
 
-generate: generated_files
-
 # Directories
 # The current directory is supposed to be something like
 # ..../yaz/win, everything is relative to that
@@ -283,7 +281,7 @@ MT=mt.exe /nologo
 MT=echo
 !endif
 
-LINK_LIBS= kernel32.lib wsock32.lib advapi32.lib \
+LINK_LIBS= kernel32.lib ws2_32.lib advapi32.lib \
           $(ICONV_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB)
 
 COMMON_LNK_OPTIONS= /nologo /subsystem:windows /machine:i386 /incremental:no
@@ -656,12 +654,13 @@ GENERATED_H_FILES= \
    $(ILL_CORE_H_FILES) \
    $(ITEM_REQ_H_FILES)
 
-generated_files: \
+generate: \
        $(GENERATED_H_FILES) \
        $(GENERATED_C_FILES) \
        $(SRCDIR)\diagsrw.c \
        $(SRCDIR)\diagbib1.c \
-       $(SRCDIR)\diagsru_update.c 
+       $(SRCDIR)\diagsru_update.c \
+       $(INCLDIR)\yaz\yaz-version.h 
 
 # Compiling 
 
@@ -771,6 +770,11 @@ $(SRCDIR)\diagsru_update.c: $(SRCDIR)\sru_update.csv
        @cd $(SRCDIR)
        $(TCL) csvtosru_update.tcl $(SRCDIR)
 
+$(INCLDIR)\yaz\yaz-version.h:
+       @cd $(SRCDIR)
+       $(TCL) mk_version.tcl $(ROOTDIR)/configure.ac $(INCLDIR)\yaz\yaz-version.h
+
+
 !endif
 
 !if $(HAVE_BISON)