X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=c296ed07705242647ff5009eb4114a443675a947;hp=0fcceb1daf71fb48b1f3379fc658beca36b22c32;hb=1a219938c1325105582cdbc2c9a34b6fc3cdf191;hpb=652b518dd2393b9ab6bafaf384ca3bbd8a746f18

diff --git a/win/makefile b/win/makefile
index 0fcceb1..c296ed0 100644
--- a/win/makefile
+++ b/win/makefile
@@ -43,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"
@@ -53,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
 
@@ -69,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:
@@ -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