Allow version.nsi to be generated on Windows

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

diff --git a/win/makefile b/win/makefile
index d04f932..c296ed0 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -18,6 +18,7 @@ ICONV_DIR = c:\iconv-1.9.2.win32
 # icu charcter conversion utility
 # get icu libraries from http://www.icu-project.org
 HAVE_ICU=1
+ICU_VER=54
 ICU_LIB = c:\icu\lib
 ICU_BIN = c:\icu\bin
 ICU_INCLUDE = c:\icu\include
@@ -42,7 +43,7 @@ default: all
 all: dirs generate dll sc_test client ztest yazicu zoomsh utilprog \
  testprog iconv icu libxml2 libxslt yaz_url
 
-allj: all
+allj: all yaz4j
 
 NSIS="c:\program files (x86)\nsis\makensis.exe"
 HHC="c:\program files (x86)\html help workshop\hhc.exe"
@@ -52,11 +53,11 @@ YAZ4J_DIR="..\..\yaz4j"
 YAZPATH="$(MAKEDIR)\.."
 
 
-dist: yaz.win32.nsi yaz.nsi distclean
+dist: yaz.win32.nsi yaz.nsi version.nsi distclean
        nmake DEBUG=0 allj
        $(NSIS) yaz.win32.nsi
 
-dist64: yaz.win64.nsi yaz.nsi distclean
+dist64: yaz.win64.nsi yaz.nsi version.nsi distclean
        nmake make64
        $(NSIS) yaz.win64.nsi
 
@@ -68,10 +69,10 @@ distclean:
        nmake DEBUG=1 clean
        nmake DEBUG=0 clean
 
-nsis: all yaz.win32.nsi
+nsis: all yaz.win32.nsi version.nsi
        $(NSIS) yaz.win32.nsi
 
-nsis64: yaz.win64.nsi
+nsis64: yaz.win64.nsi version.nsi
        $(NSIS) yaz.win64.nsi
 
 nsishelp:
@@ -191,7 +192,6 @@ iconv:
 !if $(HAVE_ICU)
 ICU_DEF= \
   /D YAZ_HAVE_ICU=1 /D HAVE_ICU_H=1 /I"$(ICU_INCLUDE)"
-ICU_VER=54
 ICU_LIBS= \
   $(ICU_LIB)\icudt.lib $(ICU_LIB)\icuin.lib $(ICU_LIB)\icuuc.lib
 icu: $(BINDIR)\icudt$(ICU_VER).dll \
@@ -486,6 +486,7 @@ MISC_OBJS= \
    $(OBJDIR)\charneg.obj \
    $(OBJDIR)\grs1disp.obj \
    $(OBJDIR)\opac_to_xml.obj \
+   $(OBJDIR)\xml_get.obj \
    $(OBJDIR)\xml_add.obj \
    $(OBJDIR)\xml_match.obj \
    $(OBJDIR)\xml_to_opac.obj \
@@ -874,6 +875,9 @@ $(INCLDIR)\yaz\yaz-version.h: $(ROOTDIR)/IDMETA
        @cd $(SRCDIR)
        $(TCL) mk_version.tcl $(ROOTDIR)/IDMETA $(INCLDIR)\yaz\yaz-version.h
 
+version.nsi: $(ROOTDIR)/IDMETA
+       $(TCL) $(SRCDIR)/mk_version.tcl $(ROOTDIR)/IDMETA version.nsi
+
 
 !endif