X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=3137e9891df7f55f83aeeca4315801c1882c804e;hp=2ff3d313cd5f0bdf38414649147836a97c69261a;hb=9bf84c30a3d0e3e1d4b9136aee9c0a4b8ae769d2;hpb=7eeb1efed000ed90d27018fd717301096daf65e4

diff --git a/win/makefile b/win/makefile
index 2ff3d31..3137e98 100644
--- 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.23+.win32
+LIBXSLT_DIR=c:\libxslt-1.1.24.win32
 
 # libxml2
 HAVE_LIBXML2=1
-LIBXML2_DIR=c:\libxml2-2.6.32+.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
@@ -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)