Update WIN32 makefile for renamed tests

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

diff --git a/win/makefile b/win/makefile
index 3815beb..83e3bcb 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -4,7 +4,7 @@
 # Parameters 
 
 DEBUG=0   # 0 for release, 1 for debug
-USE_MANIFEST = 0
+USE_MANIFEST = 1
 
 # TCL
 TCL="C:\Tcl\bin\tclsh85.exe"
@@ -120,8 +120,8 @@ CQL2PQF=$(BINDIR)\cql2pqf.exe
 CQL2XCQL=$(BINDIR)\cql2xcql.exe
 YAZ_MARCDUMP=$(BINDIR)\yaz-marcdump.exe
 
-TSTLOG=$(BINDIR)\tstlog.exe
-TST_TIMING=$(BINDIR)\tst_timing.exe
+TSTLOG=$(BINDIR)\test_log.exe
+TST_TIMING=$(BINDIR)\test_timing.exe
 
 # shortcut names defined here
 dll: dirs generate $(YAZ_DLL) 
@@ -366,10 +366,10 @@ YAZ_MARCDUMP_OBJS = \
 
 
 TSTLOG_OBJS = \
-   $(OBJDIR)\tstlog.obj
+   $(OBJDIR)\test_log.obj
 
 TST_TIMING_OBJS = \
-   $(OBJDIR)\tst_timing.obj
+   $(OBJDIR)\test_timing.obj
 
 MISC_OBJS= \
    $(OBJDIR)\version.obj \
@@ -496,7 +496,10 @@ MISC_OBJS= \
    $(OBJDIR)\iconv_decode_danmarc.obj \
    $(OBJDIR)\mutex.obj \
    $(OBJDIR)\json.obj \
-   $(OBJDIR)\sc.obj
+   $(OBJDIR)\sc.obj \
+   $(OBJDIR)\xml_include.obj \
+   $(OBJDIR)\file_glob.obj \
+   $(OBJDIR)\dirent.obj
 
 Z3950_OBJS= \
    $(OBJDIR)\z-date.obj\
@@ -782,7 +785,7 @@ $(SRCDIR)\diagsru_update.c: $(SRCDIR)\sru_update.csv
        @cd $(SRCDIR)
        $(TCL) csvtosru_update.tcl $(SRCDIR)
 
-$(INCLDIR)\yaz\yaz-version.h:
+$(INCLDIR)\yaz\yaz-version.h: $(ROOTDIR)/configure.ac
        @cd $(SRCDIR)
        $(TCL) mk_version.tcl $(ROOTDIR)/configure.ac $(INCLDIR)\yaz\yaz-version.h