Win32 makefile: dist depends nsi

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

diff --git a/win/makefile b/win/makefile
index ee78c78..e2e0fa8 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # This file is part of the YAZ toolkit.
-# Copyright (C) 1995-2008 Index Data
+# Copyright (C) 1995-2009 Index Data
 #
 # Programmed by
 #  Heikki Levanto & Adam Dickmeiss
@@ -48,13 +48,13 @@ all: dirs generate dll sc_test client ztest yazicu zoomsh utilprog testprog icon
 NSIS="c:\program files\nsis\makensis.exe"
 HHC="c:\program files\html help workshop\hhc.exe"
 
-dist: 
+dist: yaz.nsi
        nmake DEBUG=1 clean
        nmake DEBUG=0 clean
        nmake DEBUG=0
        $(NSIS) yaz.nsi
 
-nsis:
+nsis: all yaz.nsi
        $(NSIS) yaz.nsi
 
 nsishelp:
@@ -403,6 +403,7 @@ MISC_OBJS= \
    $(OBJDIR)\ber_oid.obj \
    $(OBJDIR)\ber_tag.obj \
    $(OBJDIR)\dumpber.obj \
+   $(OBJDIR)\errno.obj \
    $(OBJDIR)\odr.obj \
    $(OBJDIR)\odr_any.obj \
    $(OBJDIR)\odr_bit.obj \
@@ -483,6 +484,7 @@ MISC_OBJS= \
    $(OBJDIR)\xcqlutil.obj \
    $(OBJDIR)\elementset.obj \
    $(OBJDIR)\timing.obj \
+   $(OBJDIR)\uri.obj \
    $(OBJDIR)\query-charset.obj \
    $(OBJDIR)\tokenizer.obj \
    $(OBJDIR)\copy_types.obj \
@@ -761,7 +763,7 @@ $(SRCDIR)\iso5426.c: $(SRCDIR)\codetables-iso5426.xml $(SRCDIR)\charconv.tcl
        @cd $(SRCDIR)
        $(TCL) charconv.tcl -r -p iso5426 codetables-iso5426.xml -o iso5426.c
 
-$(SRCDIR)\oid_std.c: $(SRCDIR)\oid.csv $(SRCDIR)\charconv.tcl
+$(SRCDIR)\oid_std.c: $(SRCDIR)\oid.csv 
        @cd $(SRCDIR)
        $(TCL) oidtoc.tcl $(SRCDIR) oid.csv oid_std.c oid_std.h