# This file is part of the YAZ toolkit.
-# Copyright (C) 1995-2009 Index Data
-#
-# Programmed by
-# Heikki Levanto & Adam Dickmeiss
+# Copyright (C) 1995-2010 Index Data
# Parameters
DEBUG=0 # 0 for release, 1 for debug
-USE_MANIFEST = 0
+USE_MANIFEST = 1
# TCL
TCL="C:\Tcl\bin\tclsh85.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
+TEST_MUTEX=$(BINDIR)\test_mutex.exe
# shortcut names defined here
dll: dirs generate $(YAZ_DLL)
$(ZOOMTST10)
utilprog: $(CQL2PQF) $(CQL2XCQL) $(YAZ_MARCDUMP)
-testprog: $(TSTLOG) $(TST_TIMING)
+testprog: $(TSTLOG) $(TST_TIMING) $(TEST_MUTEX)
htmlhelp: $(DOCDIR)\htmlhelp.chm
TSTLOG_OBJS = \
- $(OBJDIR)\tstlog.obj
+ $(OBJDIR)\test_log.obj
TST_TIMING_OBJS = \
- $(OBJDIR)\tst_timing.obj
+ $(OBJDIR)\test_timing.obj
+
+TEST_MUTEX_OBJS = \
+ $(OBJDIR)\test_mutex.obj
MISC_OBJS= \
$(OBJDIR)\version.obj \
$(OBJDIR)\iso5426.obj \
$(OBJDIR)\record_conv.obj \
$(OBJDIR)\retrieval.obj \
- $(OBJDIR)\libxml2_error.obj \
$(OBJDIR)\test.obj \
$(OBJDIR)\diagbib1.obj \
$(OBJDIR)\diagsru_update.obj \
$(OBJDIR)\iconv_decode_iso5426.obj \
$(OBJDIR)\iconv_decode_danmarc.obj \
$(OBJDIR)\mutex.obj \
- $(OBJDIR)\sc.obj
+ $(OBJDIR)\gettimeofday.obj \
+ $(OBJDIR)\json.obj \
+ $(OBJDIR)\sc.obj \
+ $(OBJDIR)\xml_include.obj \
+ $(OBJDIR)\file_glob.obj \
+ $(OBJDIR)\thread_id.obj \
+ $(OBJDIR)\dirent.obj
Z3950_OBJS= \
$(OBJDIR)\z-date.obj\
@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
$(LINK_PROGRAM) $(TST_TIMING_OBJS) /out:$@
$(MT) -manifest $@.manifest -outputresource:$@;1
+$(TEST_MUTEX) : "$(BINDIR)" $(TEST_MUTEX_OBJS) $(YAZ_DLL)
+ $(LINK_PROGRAM) $(TEST_MUTEX_OBJS) /out:$@
+ $(MT) -manifest $@.manifest -outputresource:$@;1
+
# Other rules
$(DOCDIR)\htmlhelp.chm: $(DOCDIR)\htmlhelp.hhp